Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-diffdir.out @ 1729:ace6d26f78f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 15 Feb 2006 10:40:15 -0800
parents fde8fb2cbede
children 7544700fd931
comparison
equal deleted inserted replaced
1728:9b92b71d5dd7 1729:ace6d26f78f1
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