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

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

tests/test-diffdir.out

author	Vadim Gelfer <vadim.gelfer@gmail.com>
	Tue, 15 Aug 2006 11:38:07 -0700
changeset 2903	013921c753bd
parent 1933	7544700fd931
child 3822	000d122071b5
permissions	-rw-r--r--

merge with other head by default, not tip. fixes issue 339.


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