upstream/mercurial-mirror Files · contrib/hgsh/Makefile

simplemerge: make minimize() a free function...

simplemerge: make minimize() a free function IMO, `Merge3Text` should be about merging text without knowing about conflict markers. "Conflict minimization" is about making conflict markers smaller, so it should be moved out. This patch does that. I'll refactor it next. Differential Revision: https://phab.mercurial-scm.org/D11980

Vadim Gelfer - - Load All Authors

File last commit:

r2341:dbbe7f72 default


                r49395:a0cb1623

default

Download file

             Makefile
        
                    13 lines
            
             | 160 B
            
                | text/x-makefile
            
             |
                MakefileLexer
            
             / contrib / hgsh / Makefile
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      CC := gcc

      CFLAGS := -g -O2 -Wall -Werror

      prefix ?= /usr/bin

      hgsh: hgsh.o

      	$(CC) -o $@ $<

      install: hgsh

      	install -m755 hgsh $(prefix)

      clean:

      	rm -f *.o hgsh

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				CC := gcc
				CFLAGS := -g -O2 -Wall -Werror

				prefix ?= /usr/bin

				hgsh: hgsh.o
				$(CC) -o $@ $<

				install: hgsh
				install -m755 hgsh $(prefix)

				clean:
				rm -f *.o hgsh