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

tests/test-diffdir.out

author	Benoit Boissinot <benoit.boissinot@ens-lyon.org>
	Wed, 14 Dec 2005 21:01:57 -0600
changeset 1571	bcdc030c59f8
parent 925	5a034646e472
child 1723	fde8fb2cbede
permissions	-rw-r--r--

add a --switch-parent option to export against the other parent


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