equal
deleted
inserted
replaced
411 |
411 |
412 $ hg resolve -m |
412 $ hg resolve -m |
413 (no more unresolved files) |
413 (no more unresolved files) |
414 continue: hg evolve --continue |
414 continue: hg evolve --continue |
415 $ hg evolve --continue |
415 $ hg evolve --continue |
416 merge:[17] More addition (2) |
|
417 with: [18] More addition (2) |
|
418 base: [16] More addition |
|
419 updating to "local" side of the conflict: 0b336205a5d0 |
|
420 merging "other" content-divergent changeset 'e015aa78acee' |
|
421 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
422 working directory is now at e015aa78acee |
416 working directory is now at e015aa78acee |
423 $ glog |
417 $ glog |
424 @ 18:e015aa78acee@default(draft) bk:[] More addition (2) |
418 @ 18:e015aa78acee@default(draft) bk:[] More addition (2) |
425 | |
419 | |
426 | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: |
420 | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: |