Mercurial > hg
view tests/test-diffdir.out @ 5242:9cd6578750b9
improve error message for 'hg merge' when repo already at branchtip
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Sat, 25 Aug 2007 11:30:11 +0200 |
| parents | f80cf8b7bbd9 |
| children | c0c4c7b1e8d3 |
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!