##// END OF EJS Templates
merge with crew-stable
merge with crew-stable

File last commit:

r4180:f80cf8b7 default
r4181:ac9e891f merge default
Show More
test-diffdir.out
22 lines | 316 B | text/plain | TextLexer
diff -r 4da5fa99f904 b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
diff -r 4da5fa99f904 b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
diff -r 4da5fa99f904 a
--- a/a
+++ b/a
@@ -0,0 +1,1 @@
+foo
diff -r 4da5fa99f904 b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
abort: Ambiguous identifier!
abort: Ambiguous identifier!