diff options
Diffstat (limited to 'tests/test-merge9.t')
| -rw-r--r-- | tests/test-merge9.t | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/test-merge9.t b/tests/test-merge9.t index 85e06f0..7d8b0e6 100644 --- a/tests/test-merge9.t +++ b/tests/test-merge9.t @@ -83,12 +83,10 @@ resolve all $ hg resolve -a merging bar warning: conflicts during merge. - merging bar incomplete! (edit conflicts, then use 'hg resolve --mark') + merging bar failed! [1] after $ hg resolve -l U bar R baz - - $ cd .. |