Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-diffdir.out @ 4197:b2873c587b1a
branch: require --force to shadow existing branches
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Mon, 12 Mar 2007 14:44:14 -0700 |
parents | 4574a8cb080f |
children | f80cf8b7bbd9 |
line wrap: on
line source
diff -r 4da5fa99f904 b --- /dev/null +++ b/b @@ -0,0 +1,1 @@ +123 diff -r 4da5fa99f904 b --- /dev/null +++ b/b @@ -0,0 +1,1 @@ +123 diff -r 4da5fa99f904 a --- a/a +++ b/a @@ -0,0 +1,1 @@ +foo diff -r 4da5fa99f904 b --- /dev/null +++ b/b @@ -0,0 +1,1 @@ +123 abort: Ambiguous identifier! abort: Ambiguous identifier!