mercurial-crew-with-dirclash: tests/test-merge4@83e8cd97b9f9

Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision

tests/test-merge4

author	Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
	Mon, 06 Feb 2006 17:32:00 -0600
changeset 1699	83e8cd97b9f9
parent 814	0902ffece4b4
child 1933	7544700fd931
permissions	-rwxr-xr-x

hgmerge: add and use more tool variables This patch adds even more customisable variables with tool paths. Also moves $FILEMERGE where it belongs.


#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "0 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "0 0"
hg update 0
echo This is file c1 > c
hg add c
hg commit -m "commit #2" -d "0 0"
hg update -m 1
rm b
echo This is file c22 > c
hg commit -m "commit #3" -d "0 0"

mercurial-crew-with-dirclash

RSS Atom