1693 created new head |
1693 created new head |
1694 $ hg merge 7 |
1694 $ hg merge 7 |
1695 merging foo |
1695 merging foo |
1696 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
1696 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
1697 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
1697 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
1698 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
1698 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
1699 [1] |
1699 [1] |
1700 $ echo 'merge 1' > foo |
1700 $ echo 'merge 1' > foo |
1701 $ hg resolve -m foo |
1701 $ hg resolve -m foo |
1702 (no more unresolved files) |
1702 (no more unresolved files) |
1703 $ hg ci -m "First merge, related" |
1703 $ hg ci -m "First merge, related" |
1704 |
1704 |
1705 $ hg merge 4 |
1705 $ hg merge 4 |
1706 merging foo |
1706 merging foo |
1707 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
1707 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
1708 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
1708 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
1709 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
1709 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
1710 [1] |
1710 [1] |
1711 $ echo 'merge 2' > foo |
1711 $ echo 'merge 2' > foo |
1712 $ hg resolve -m foo |
1712 $ hg resolve -m foo |
1713 (no more unresolved files) |
1713 (no more unresolved files) |
1714 $ hg ci -m "Last merge, related" |
1714 $ hg ci -m "Last merge, related" |