Mercurial > hg
comparison tests/test-log.t @ 15501:2371f4aea665
merge: give a special message for internal:merge failure (issue3105)
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 16 Nov 2011 18:04:19 -0600 |
parents | db0340f4b507 |
children | fc8c7a5ccc4a |
comparison
equal
deleted
inserted
replaced
15500:d5abe76da61e | 15501:2371f4aea665 |
---|---|
920 $ hg ci -m "change foo in branch, related" | 920 $ hg ci -m "change foo in branch, related" |
921 created new head | 921 created new head |
922 $ hg merge 7 | 922 $ hg merge 7 |
923 merging foo | 923 merging foo |
924 warning: conflicts during merge. | 924 warning: conflicts during merge. |
925 merging foo failed! | 925 merging foo incomplete! (edit conflicts, then use 'hg resolve --mark') |
926 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 926 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
927 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 927 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
928 [1] | 928 [1] |
929 $ echo 'merge 1' > foo | 929 $ echo 'merge 1' > foo |
930 $ hg resolve -m foo | 930 $ hg resolve -m foo |
931 $ hg ci -m "First merge, related" | 931 $ hg ci -m "First merge, related" |
932 | 932 |
933 $ hg merge 4 | 933 $ hg merge 4 |
934 merging foo | 934 merging foo |
935 warning: conflicts during merge. | 935 warning: conflicts during merge. |
936 merging foo failed! | 936 merging foo incomplete! (edit conflicts, then use 'hg resolve --mark') |
937 1 files updated, 0 files merged, 0 files removed, 1 files unresolved | 937 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
938 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 938 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
939 [1] | 939 [1] |
940 $ echo 'merge 2' > foo | 940 $ echo 'merge 2' > foo |
941 $ hg resolve -m foo | 941 $ hg resolve -m foo |