Skip to content
Snippets Groups Projects
Commit 9f1dd4cb authored by Siddharth Agarwal's avatar Siddharth Agarwal
Browse files

tests: fix breakage caused by Mercurial changes

Mercurial commit e4f451c8c05c added a new message to `hg resolve` with no more
unresolved files.
parent 47d743e0
No related branches found
No related tags found
No related merge requests found
......@@ -23,7 +23,7 @@
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
resolve using first parent
$ echo C > afile
$ hg resolve -m afile
$ hg resolve -m afile | egrep -v '^no more unresolved files$' || true
$ hg ci -m "merge to C"
$ hg log --graph --style compact | sed 's/\[.*\]//g'
......
......@@ -23,7 +23,7 @@
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
resolve using second parent
$ echo B > afile
$ hg resolve -m afile
$ hg resolve -m afile | egrep -v '^no more unresolved files$' || true
$ hg ci -m "merge to B"
$ hg log --graph --style compact | sed 's/\[.*\]//g'
......
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