Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge-local.out @ 4361:46280c004f22

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change tests to use simplemerge by default
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 16 Apr 2007 20:17:39 -0300
parents 4787e2b0dd03
children 0912d8df5e19
comparison
equal deleted inserted replaced
4360:d5c3a70f8422 4361:46280c004f22
34 +++ b/zzz2_merge_bad 34 +++ b/zzz2_merge_bad
35 +another last line 35 +another last line
36 M zzz1_merge_ok 36 M zzz1_merge_ok
37 M zzz2_merge_bad 37 M zzz2_merge_bad
38 # local merge with conflicts 38 # local merge with conflicts
39 merge: warning: conflicts during merge 39 warning: conflicts during merge.
40 merging zzz1_merge_ok 40 merging zzz1_merge_ok
41 merging zzz2_merge_bad 41 merging zzz2_merge_bad
42 merging zzz2_merge_bad failed! 42 merging zzz2_merge_bad failed!
43 3 files updated, 1 files merged, 1 files removed, 1 files unresolved 43 3 files updated, 1 files merged, 1 files removed, 1 files unresolved
44 There are unresolved merges with locally modified files. 44 There are unresolved merges with locally modified files.