Mercurial > hg
view tests/test-diffdir.out @ 7142:88f1b8081f1c
Prevent import over an applied patch (closes issue795)
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Sat, 18 Oct 2008 13:22:29 -0700 |
| 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!