Mercurial > hg
view tests/test-diffdir.out @ 10585:37db57bc7fd7 stable
Merge with hg-i18n
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Thu, 04 Mar 2010 10:05:12 +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!