tests/test-diff-subdir.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 16 Nov 2009 11:55:29 +0100
changeset 9858 ea38a2c1bdd3
parent 2879 66eff8355168
permissions -rw-r--r--
lock: the correct way to do a trylock() is to use a timeout of 0

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