##// END OF EJS Templates
Merge with upstream
Merge with upstream

File last commit:

r1723:fde8fb2c default
r1743:813f9f5f merge default
Show More
test-diffdir.out
20 lines | 258 B | text/plain | TextLexer
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
diff -r 3903775176ed a
--- a/a
+++ b/a
@@ -0,0 +1,1 @@
+foo
diff -r 3903775176ed b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123