Mercurial > hg
view tests/test-diffdir.out @ 4115:c95060a5391a
merge: fix renaming of subdirectories under renamed directories
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 27 Feb 2007 16:20:06 -0600 |
| parents | 000d122071b5 |
| children | 4574a8cb080f |
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!