Mercurial > hg > mercurial-crew-with-dirclash
view 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 |
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