equal
deleted
inserted
replaced
988 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
988 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
989 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
989 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
990 [1] |
990 [1] |
991 $ echo 'merge 1' > foo |
991 $ echo 'merge 1' > foo |
992 $ hg resolve -m foo |
992 $ hg resolve -m foo |
|
993 no unresolved files; you may continue your unfinished operation |
993 $ hg ci -m "First merge, related" |
994 $ hg ci -m "First merge, related" |
994 |
995 |
995 $ hg merge 4 |
996 $ hg merge 4 |
996 merging foo |
997 merging foo |
997 warning: conflicts during merge. |
998 warning: conflicts during merge. |
999 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
1000 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
1000 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
1001 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
1001 [1] |
1002 [1] |
1002 $ echo 'merge 2' > foo |
1003 $ echo 'merge 2' > foo |
1003 $ hg resolve -m foo |
1004 $ hg resolve -m foo |
|
1005 no unresolved files; you may continue your unfinished operation |
1004 $ hg ci -m "Last merge, related" |
1006 $ hg ci -m "Last merge, related" |
1005 |
1007 |
1006 $ hg log --graph |
1008 $ hg log --graph |
1007 @ changeset: 10:4dae8563d2c5 |
1009 @ changeset: 10:4dae8563d2c5 |
1008 |\ tag: tip |
1010 |\ tag: tip |