Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge-local.out @ 4417:0912d8df5e19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 08 May 2007 11:42:48 -0500
parents 46280c004f22 bb1800a7d7e1
children
comparison
equal deleted inserted replaced
4413:b008deae9910 4417:0912d8df5e19
19 # local merge with bad merge tool 19 # local merge with bad merge tool
20 merging zzz1_merge_ok 20 merging zzz1_merge_ok
21 merging zzz1_merge_ok failed! 21 merging zzz1_merge_ok failed!
22 merging zzz2_merge_bad 22 merging zzz2_merge_bad
23 merging zzz2_merge_bad failed! 23 merging zzz2_merge_bad failed!
24 3 files updated, 0 files merged, 1 files removed, 2 files unresolved 24 3 files updated, 0 files merged, 2 files removed, 2 files unresolved
25 There are unresolved merges with locally modified files. 25 There are unresolved merges with locally modified files.
26 You can redo the full merge using: 26 You can redo the full merge using:
27 hg update 0 27 hg update 0
28 hg update 1 28 hg update 1
29 2 files updated, 0 files merged, 3 files removed, 0 files unresolved 29 2 files updated, 0 files merged, 3 files removed, 0 files unresolved
38 # local merge with conflicts 38 # local merge with conflicts
39 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, 2 files removed, 1 files unresolved
44 There are unresolved merges with locally modified files. 44 There are unresolved merges with locally modified files.
45 You can finish the partial merge using: 45 You can finish the partial merge using:
46 hg update 0 46 hg update 0
47 hg update 1 47 hg update 1
48 2 files updated, 0 files merged, 3 files removed, 0 files unresolved 48 2 files updated, 0 files merged, 3 files removed, 0 files unresolved
57 +new last line 57 +new last line
58 M zzz1_merge_ok 58 M zzz1_merge_ok
59 M zzz2_merge_bad 59 M zzz2_merge_bad
60 # local merge without conflicts 60 # local merge without conflicts
61 merging zzz1_merge_ok 61 merging zzz1_merge_ok
62 4 files updated, 1 files merged, 1 files removed, 0 files unresolved 62 4 files updated, 1 files merged, 2 files removed, 0 files unresolved
63 --- a/zzz1_merge_ok 63 --- a/zzz1_merge_ok
64 +++ b/zzz1_merge_ok 64 +++ b/zzz1_merge_ok
65 +new last line 65 +new last line
66 M zzz1_merge_ok 66 M zzz1_merge_ok
67 ? zzz2_merge_bad.orig 67 ? zzz2_merge_bad.orig