tests/test-diff-subdir.out
author Patrick Mezard <pmezard@gmail.com>
Mon, 13 Apr 2009 21:21:01 +0200
changeset 8064 5c7bc1aece9e
parent 2879 66eff8355168
permissions -rw-r--r--
extdiff: merge node and working dir snapshot modes

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