Mercurial > hg
view tests/test-diffdir.out @ 10628:6227c8d669d5
rebase: improve output of hg pull --rebase (issue2072)
| author | Sune Foldager <cryo@cyanite.org> |
|---|---|
| date | Wed, 10 Mar 2010 12:38:33 +0100 |
| parents | c0c4c7b1e8d3 |
| 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: 00changelog.i@: ambiguous identifier! abort: 00changelog.i@: ambiguous identifier!