Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-diffdir.out @ 4782:7cd8a00d08de
merge with crew-stable
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 03 Jul 2007 12:46:34 +0200 |
parents | f80cf8b7bbd9 |
children |
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!