##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

change tests to use simplemerge by default
change tests to use simplemerge by default
Matt Mackall - - Load All Authors

File last commit:

r4180:f80cf8b7 default
r4365:46280c00 default
Show More
test-diffdir.out
22 lines | 316 B | text/plain | TextLexer
/ tests / test-diffdir.out
History | Annotation | Raw |Copy content |Copy permalink
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
abort: Ambiguous identifier!
abort: Ambiguous identifier!