mercurial-crew-with-dirclash: tests/test-backwards-remove.out@ca080d28d0af

tests/test-backwards-remove.out

author	Thomas Arendsen Hein <thomas@intevation.de>
	Thu, 04 Aug 2005 17:23:31 +0100
changeset 830	ca080d28d0af
parent 814	0902ffece4b4
child 925	5a034646e472
permissions	-rw-r--r--

If rejects are empty after using the editor, merge with diff+patch was ok.


+ hg init
+ hg add a
+ hg commit -m commit #0 -d 0 0
a
+ hg add b
+ hg commit -m commit #1 -d 0 0
+ hg co 0
a

mercurial-crew-with-dirclash