Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-diffdir.out @ 1752:457cdec745f8
merge with crew
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sun, 19 Feb 2006 22:41:49 +0100 |
parents | fde8fb2cbede |
children | 7544700fd931 |
line wrap: on
line source
diff -r 3903775176ed b --- /dev/null +++ b/b @@ -0,0 +1,1 @@ +123 diff -r 3903775176ed b --- /dev/null +++ b/b @@ -0,0 +1,1 @@ +123 diff -r 3903775176ed a --- a/a +++ b/a @@ -0,0 +1,1 @@ +foo diff -r 3903775176ed b --- /dev/null +++ b/b @@ -0,0 +1,1 @@ +123