Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge-revert2.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 ad6f34c83c3d
children 93a4e72b4f83
comparison
equal deleted inserted replaced
4360:d5c3a70f8422 4361:46280c004f22
7 reverting file1 7 reverting file1
8 9eca13a34789 8 9eca13a34789
9 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 9 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
10 f248da0d4c3e tip 10 f248da0d4c3e tip
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12 merge: warning: conflicts during merge 12 warning: conflicts during merge.
13 merging file1 13 merging file1
14 merging file1 failed! 14 merging file1 failed!
15 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 15 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
16 There are unresolved merges with locally modified files. 16 There are unresolved merges with locally modified files.
17 You can redo the full merge using: 17 You can redo the full merge using: