equal
deleted
inserted
replaced
132 $ hg commit -qm 'new file in target directory' |
132 $ hg commit -qm 'new file in target directory' |
133 $ hg merge 2 |
133 $ hg merge 2 |
134 merging b/c and a/c to b/c |
134 merging b/c and a/c to b/c |
135 warning: conflicts while merging b/c! (edit, then use 'hg resolve --mark') |
135 warning: conflicts while merging b/c! (edit, then use 'hg resolve --mark') |
136 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
136 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
137 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
137 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
138 [1] |
138 [1] |
139 $ hg st -A |
139 $ hg st -A |
140 M b/c |
140 M b/c |
141 a/c |
141 a/c |
142 ? a/d |
142 ? a/d |
162 C a/c |
162 C a/c |
163 $ hg merge 5 |
163 $ hg merge 5 |
164 merging a/c and b/c to b/c |
164 merging a/c and b/c to b/c |
165 warning: conflicts while merging b/c! (edit, then use 'hg resolve --mark') |
165 warning: conflicts while merging b/c! (edit, then use 'hg resolve --mark') |
166 2 files updated, 0 files merged, 2 files removed, 1 files unresolved |
166 2 files updated, 0 files merged, 2 files removed, 1 files unresolved |
167 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
167 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
168 [1] |
168 [1] |
169 $ hg st -A |
169 $ hg st -A |
170 M b/a |
170 M b/a |
171 M b/b |
171 M b/b |
172 M b/c |
172 M b/c |