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

Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision

tests/test-diffdir.out

author	Thomas Arendsen Hein <thomas@intevation.de>
	Mon, 03 Jul 2006 19:28:31 +0200
changeset 2552	bb403d427974
parent 1933	7544700fd931
child 3822	000d122071b5
permissions	-rw-r--r--

Adjusted test output to changed abort message of 'hg merge' (from 0229ff95faec)


diff -r acd8075edac9 b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
diff -r acd8075edac9 b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
diff -r acd8075edac9 a
--- a/a
+++ b/a
@@ -0,0 +1,1 @@
+foo
diff -r acd8075edac9 b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123

mercurial-crew-with-dirclash

RSS Atom