Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-diffdir.out @ 1828:ca82f20b0c19
merge with crew.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Fri, 03 Mar 2006 08:44:37 -0800 |
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