mercurial-crew-with-dirclash: tests/test-diffdir.out@49ec802b4a16

tests/test-diffdir.out

author	Thomas Arendsen Hein <thomas@intevation.de>
	Sat, 23 Jul 2005 17:14:05 +0100
changeset 792	49ec802b4a16
parent 574	af7e21f3b2d9
child 801	1f9ec150a476
child 808	8f5637f0a0c0
child 814	0902ffece4b4
permissions	-rw-r--r--

Added tests for bug with three-way-merging of old tip, tip and cwd.


diff -r 3903775176ed b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
diff -r 3903775176ed b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123

mercurial-crew-with-dirclash