Mercurial > hg-git
changeset 940:93d58b79d816
tests: update for new merge output
author | Sean Farley <sean@farley.io> |
---|---|
date | Fri, 16 Oct 2015 16:14:51 -0700 |
parents | c85c28fbc8a5 |
children | d1546c673c65 |
files | tests/test-conflict-1.t tests/test-conflict-2.t |
diffstat | 2 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-conflict-1.t Thu Oct 15 13:55:30 2015 -0700 +++ b/tests/test-conflict-1.t Fri Oct 16 16:14:51 2015 -0700 @@ -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
--- a/tests/test-conflict-2.t Thu Oct 15 13:55:30 2015 -0700 +++ b/tests/test-conflict-2.t Fri Oct 16 16:14:51 2015 -0700 @@ -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