Skip to content
Snippets Groups Projects
Commit 93d58b79 authored by Sean Farley's avatar Sean Farley
Browse files

tests: update for new merge output

parent c85c28fb
No related branches found
No related tags found
No related merge requests found
......@@ -16,9 +16,8 @@
$ hg ci -m "A->C"
created new head
$ hg merge -r1 2>&1 | sed 's/-C ./-C/' | egrep -v '^merging afile$' | sed 's/incomplete.*/failed!/'
warning: conflicts during merge.
merging afile failed!
$ hg merge -r1 2>&1 | sed 's/-C ./-C/' | egrep -v '^merging afile' | sed 's/incomplete.*/failed!/'
warning: conflicts.* (re)
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
resolve using first parent
......
......@@ -16,9 +16,8 @@
$ hg ci -m "A->C"
created new head
$ hg merge -r1 2>&1 | sed 's/-C ./-C/' | egrep -v '^merging afile$' | sed 's/incomplete.*/failed!/'
warning: conflicts during merge.
merging afile failed!
$ hg merge -r1 2>&1 | sed 's/-C ./-C/' | egrep -v '^merging afile' | sed 's/incomplete.*/failed!/'
warning: conflicts.* (re)
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
resolve using second parent
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment