1271 $ echo 'change foo in branch' > foo |
1271 $ echo 'change foo in branch' > foo |
1272 $ hg ci -m "change foo in branch, related" |
1272 $ hg ci -m "change foo in branch, related" |
1273 created new head |
1273 created new head |
1274 $ hg merge 7 |
1274 $ hg merge 7 |
1275 merging foo |
1275 merging foo |
1276 warning: conflicts during merge. |
1276 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
1277 merging foo incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
1278 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
1277 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
1279 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
1278 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
1280 [1] |
1279 [1] |
1281 $ echo 'merge 1' > foo |
1280 $ echo 'merge 1' > foo |
1282 $ hg resolve -m foo |
1281 $ hg resolve -m foo |
1283 (no more unresolved files) |
1282 (no more unresolved files) |
1284 $ hg ci -m "First merge, related" |
1283 $ hg ci -m "First merge, related" |
1285 |
1284 |
1286 $ hg merge 4 |
1285 $ hg merge 4 |
1287 merging foo |
1286 merging foo |
1288 warning: conflicts during merge. |
1287 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
1289 merging foo incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
1290 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
1288 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
1291 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
1289 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
1292 [1] |
1290 [1] |
1293 $ echo 'merge 2' > foo |
1291 $ echo 'merge 2' > foo |
1294 $ hg resolve -m foo |
1292 $ hg resolve -m foo |