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

tests/test-diffdir.out

author	Benoit Boissinot <benoit.boissinot@ens-lyon.org>
	Wed, 01 Feb 2006 08:46:24 +0100
changeset 1674	dee55c4a4963
parent 925	5a034646e472
child 1723	fde8fb2cbede
permissions	-rw-r--r--

abort when using 'update -m' and this is not a merge add more testcases for updating with local changes


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