Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-diffdir.out @ 3949:6257030134f4
Merge with crew
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 21 Dec 2006 23:17:20 -0600 |
parents | 000d122071b5 |
children | 4574a8cb080f |
line wrap: on
line source
diff -r acd8075edac9 b --- /dev/null +++ b/b @@ -0,0 +1,1 @@ +123 diff -r acd8075edac9 b --- /dev/null +++ b/b @@ -0,0 +1,1 @@ +123 diff -r acd8075edac9 a --- a/a +++ b/a @@ -0,0 +1,1 @@ +foo diff -r acd8075edac9 b --- /dev/null +++ b/b @@ -0,0 +1,1 @@ +123 abort: Ambiguous identifier! abort: Ambiguous identifier!