Mercurial > hg
view tests/test-diffdir.out @ 6795:c228ae4bc89c
merge the backout head
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Wed, 02 Jul 2008 11:31:19 +0200 |
| 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!