Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-diffdir.out @ 4883:2a01e03ffacd
Merge with crew-stable.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 15 Jul 2007 14:57:20 +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!