Mercurial > hg
diff tests/test-commit-unresolved.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 | 919174c0aaff |
children | f2719b387380 |
line wrap: on
line diff
--- a/tests/test-commit-unresolved.t Sat Nov 12 02:08:01 2011 +0100 +++ b/tests/test-commit-unresolved.t Wed Nov 16 18:04:19 2011 -0600 @@ -29,7 +29,7 @@ $ hg merge merging A warning: conflicts during merge. - merging A failed! + merging A incomplete! (edit conflicts, then use 'hg resolve --mark') 1 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon [1]