comparison tests/test-diffdir.out @ 1737:2c9872a4f3fd

Merge with crew
author Matt Mackall <mpm@selenic.com>
date Fri, 17 Feb 2006 17:39:05 -0600
parents fde8fb2cbede
children 7544700fd931
comparison
equal deleted inserted replaced
1716:ef8cd889a78b 1737:2c9872a4f3fd
6 diff -r 3903775176ed b 6 diff -r 3903775176ed b
7 --- /dev/null 7 --- /dev/null
8 +++ b/b 8 +++ b/b
9 @@ -0,0 +1,1 @@ 9 @@ -0,0 +1,1 @@
10 +123 10 +123
11 diff -r 3903775176ed a
12 --- a/a
13 +++ b/a
14 @@ -0,0 +1,1 @@
15 +foo
16 diff -r 3903775176ed b
17 --- /dev/null
18 +++ b/b
19 @@ -0,0 +1,1 @@
20 +123