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

File last commit:

r2879:66eff835 default
r4181:ac9e891f merge default
Show More
test-diff-subdir.out
23 lines | 352 B | text/plain | TextLexer
/ tests / test-diff-subdir.out
EVERYTHING
diff -r ec612a6291f1 alpha/one
--- a/alpha/one
+++ b/alpha/one
@@ -0,0 +1,1 @@
+1
diff -r ec612a6291f1 beta/two
--- a/beta/two
+++ b/beta/two
@@ -0,0 +1,1 @@
+2
BETA ONLY
diff -r ec612a6291f1 beta/two
--- a/beta/two
+++ b/beta/two
@@ -0,0 +1,1 @@
+2
INSIDE BETA
diff -r ec612a6291f1 beta/two
--- a/beta/two
+++ b/beta/two
@@ -0,0 +1,1 @@
+2