diff options
Diffstat (limited to 'tests/test-update-renames.t')
| -rw-r--r-- | tests/test-update-renames.t | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/test-update-renames.t b/tests/test-update-renames.t index 829317a..8008e4b 100644 --- a/tests/test-update-renames.t +++ b/tests/test-update-renames.t @@ -21,7 +21,10 @@ Update with local changes across a file rename $ hg up merging a and b to b warning: conflicts during merge. - merging b incomplete! (edit conflicts, then use 'hg resolve --mark') + merging b failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges [1] + + $ cd .. + |