diff options
Diffstat (limited to 'tests/test-mq-qnew.t')
| -rw-r--r-- | tests/test-mq-qnew.t | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/test-mq-qnew.t b/tests/test-mq-qnew.t index 7400cad..d8ff633 100644 --- a/tests/test-mq-qnew.t +++ b/tests/test-mq-qnew.t @@ -111,7 +111,7 @@ plain headers abort: "#" cannot be used in the name of a patch abort: ":" cannot be used in the name of a patch % qnew with name containing slash - abort: path ends in directory separator: foo/ (glob) + abort: path ends in directory separator: foo/ abort: "foo" already exists as a directory foo/bar.patch popping foo/bar.patch @@ -123,7 +123,7 @@ plain headers A series A uncommitted.patch % qnew missing - abort: missing: * (glob) + abort: missing: No such file or directory % qnew -m foo bar @@ -155,7 +155,7 @@ plain headers created new head merging a warning: conflicts during merge. - merging a incomplete! (edit conflicts, then use 'hg resolve --mark') + merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon abort: cannot manage merge changesets @@ -178,7 +178,7 @@ hg headers abort: "#" cannot be used in the name of a patch abort: ":" cannot be used in the name of a patch % qnew with name containing slash - abort: path ends in directory separator: foo/ (glob) + abort: path ends in directory separator: foo/ abort: "foo" already exists as a directory foo/bar.patch popping foo/bar.patch @@ -190,7 +190,7 @@ hg headers A series A uncommitted.patch % qnew missing - abort: missing: * (glob) + abort: missing: No such file or directory % qnew -m # HG changeset patch # Parent @@ -228,7 +228,7 @@ hg headers created new head merging a warning: conflicts during merge. - merging a incomplete! (edit conflicts, then use 'hg resolve --mark') + merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon abort: cannot manage merge changesets |