Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-diffdir.out @ 4022:bf329bda51a6
Merge branchname changes in localrepo.commit.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 11 Jan 2007 23:13:32 +0100 |
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!