Mercurial > hg

comparison tests/test-merge7.t @ 12316:4134686b83e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add exit codes to unified tests
author Matt Mackall <mpm@selenic.com>
date Thu, 16 Sep 2010 17:51:32 -0500
parents f2daa6ab514a
children ec5886db9dc6
comparison
equal deleted inserted replaced
12315:ca58f6475f1d 12316:4134686b83e1
46 merging test.txt 46 merging test.txt
47 warning: conflicts during merge. 47 warning: conflicts during merge.
48 merging test.txt failed! 48 merging test.txt failed!
49 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 49 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
50 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon 50 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
51 [1]
51 resolve conflict 52 resolve conflict
52 $ cat >test.txt <<"EOF" 53 $ cat >test.txt <<"EOF"
53 > one 54 > one
54 > two-point-five 55 > two-point-five
55 > three 56 > three
90 my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 91 my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118
91 warning: conflicts during merge. 92 warning: conflicts during merge.
92 merging test.txt failed! 93 merging test.txt failed!
93 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 94 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
94 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon 95 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
96 [1]
95 97
96 $ cat test.txt 98 $ cat test.txt
97 one 99 one
98 <<<<<<< local 100 <<<<<<< local
99 two-point-five 101 two-point-five