equal
deleted
inserted
replaced
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 |
113 zzz2_merge_bad.orig |
113 zzz2_merge_bad |
114 |
114 |
115 $ hg diff --nodates | grep "^[+-][^<>]" |
115 $ hg diff --nodates | grep "^[+-][^<>]" |
116 --- a/zzz1_merge_ok |
116 --- a/zzz1_merge_ok |
117 +++ b/zzz1_merge_ok |
117 +++ b/zzz1_merge_ok |
118 +new last line |
118 +new last line |