Mercurial > hg-stable
diff tests/test-merge-local.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 | 4134686b83e1 |
| children | ef1eb6df7071 |
line wrap: on
line diff
--- a/tests/test-merge-local.t Sat Nov 12 02:08:01 2011 +0100 +++ b/tests/test-merge-local.t Wed Nov 16 18:04:19 2011 -0600 @@ -63,7 +63,7 @@ merging zzz1_merge_ok merging zzz2_merge_bad warning: conflicts during merge. - merging zzz2_merge_bad failed! + merging zzz2_merge_bad incomplete! (edit conflicts, then use 'hg resolve --mark') 2 files updated, 1 files merged, 3 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges [1] @@ -88,7 +88,7 @@ merging zzz1_merge_ok merging zzz2_merge_bad warning: conflicts during merge. - merging zzz2_merge_bad failed! + merging zzz2_merge_bad incomplete! (edit conflicts, then use 'hg resolve --mark') 3 files updated, 1 files merged, 2 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges [1] @@ -97,7 +97,7 @@ merging zzz1_merge_ok merging zzz2_merge_bad warning: conflicts during merge. - merging zzz2_merge_bad failed! + merging zzz2_merge_bad incomplete! (edit conflicts, then use 'hg resolve --mark') 2 files updated, 1 files merged, 3 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges [1]