Mercurial > hg
view contrib/hgsh/Makefile @ 6206:0b6f12495276
fetch: switch the default parent used for a merge
This treats newly pulled changes as authoritative, and local changes as
the "satellite" changes.
The prior default behaviour is still available, via the --switch-parent
option.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 05 Mar 2008 09:10:45 -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