Mercurial > hg
view contrib/hgsh/Makefile @ 23641:a7a0f32a383f
merge: make calculateupdates() return file->action dict
This simplifies largefiles' overridecalculateupdates(), which no
longer has to do the conversion it started doing in 38e55e55ae4d
(largefiles: rewrite merge code using dictionary with entry per file,
2014-12-09).
To keep this patch small, we'll leave the name 'actionbyfile' in
overrides.py. It will be renamed in the next patch.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 11 Dec 2014 22:07:41 -0800 |
parents | dbbe7f72d15a |
children |
line wrap: on
line source
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