equal
deleted
inserted
replaced
64 |
64 |
65 $ hg co 0 |
65 $ hg co 0 |
66 merging zzz1_merge_ok |
66 merging zzz1_merge_ok |
67 merging zzz2_merge_bad |
67 merging zzz2_merge_bad |
68 warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark') |
68 warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark') |
69 2 files updated, 1 files merged, 2 files removed, 1 files unresolved |
69 2 files updated, 1 files merged, 3 files removed, 1 files unresolved |
70 use 'hg resolve' to retry unresolved file merges |
70 use 'hg resolve' to retry unresolved file merges |
71 [1] |
71 [1] |
72 |
72 |
73 $ hg diff --nodates | grep "^[+-][^<>]" |
73 $ hg diff --nodates | grep "^[+-][^<>]" |
74 --- a/zzz1_merge_ok |
74 --- a/zzz1_merge_ok |
102 |
102 |
103 $ hg co 0 --config 'ui.origbackuppath=.hg/origbackups' |
103 $ hg co 0 --config 'ui.origbackuppath=.hg/origbackups' |
104 merging zzz1_merge_ok |
104 merging zzz1_merge_ok |
105 merging zzz2_merge_bad |
105 merging zzz2_merge_bad |
106 warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark') |
106 warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark') |
107 2 files updated, 1 files merged, 2 files removed, 1 files unresolved |
107 2 files updated, 1 files merged, 3 files removed, 1 files unresolved |
108 use 'hg resolve' to retry unresolved file merges |
108 use 'hg resolve' to retry unresolved file merges |
109 [1] |
109 [1] |
110 |
110 |
111 Are orig files from the last commit where we want them? |
111 Are orig files from the last commit where we want them? |
112 $ ls .hg/origbackups |
112 $ ls .hg/origbackups |