mercurial-crew-with-dirclash: tests/test-merge3@0952d164030e

tests/test-merge3

author	Vincent Danjean <Vincent.Danjean@ens-lyon.org>
	Thu, 12 Jan 2006 06:29:06 +0100
changeset 1614	0952d164030e
parent 814	0902ffece4b4
child 1933	7544700fd931
permissions	-rwxr-xr-x

hgk.py is not a script (no '#!' line needed)


#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "0 0"
touch b
hg add b
rm b
hg commit -A -m"comment #1" -d "0 0"

mercurial-crew-with-dirclash