Mercurial > hg > hg-git

comparison tests/test-conflict-1.t @ 724:9f1dd4cb15f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: fix breakage caused by Mercurial changes Mercurial commit e4f451c8c05c added a new message to `hg resolve` with no more unresolved files.
author Siddharth Agarwal <sid0@fb.com>
date Mon, 19 May 2014 19:52:22 -0700
parents 163c452531cf
children 5e2f63e1064c
comparison
equal deleted inserted replaced
723:47d743e06852 724:9f1dd4cb15f6
21 merging afile failed! 21 merging afile failed!
22 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 22 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
23 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon 23 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
24 resolve using first parent 24 resolve using first parent
25 $ echo C > afile 25 $ echo C > afile
26 $ hg resolve -m afile 26 $ hg resolve -m afile | egrep -v '^no more unresolved files$' || true
27 $ hg ci -m "merge to C" 27 $ hg ci -m "merge to C"
28 28
29 $ hg log --graph --style compact | sed 's/\[.*\]//g' 29 $ hg log --graph --style compact | sed 's/\[.*\]//g'
30 @ 3:2,1 6c53bc0f062f 1970-01-01 00:00 +0000 test 30 @ 3:2,1 6c53bc0f062f 1970-01-01 00:00 +0000 test
31 |\ merge to C 31 |\ merge to C