Mercurial > hg
view tests/test-diffdir.out @ 4674:723e0ddb6ada
merge: warn user about divergent renames
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 21 Jun 2007 18:02:03 -0500 |
| 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!