Mercurial > hg
diff tests/test-rebase-check-restore.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 | b19b4c1df066 |
children | fc8c7a5ccc4a |
line wrap: on
line diff
--- a/tests/test-rebase-check-restore.t Sat Nov 12 02:08:01 2011 +0100 +++ b/tests/test-rebase-check-restore.t Wed Nov 16 18:04:19 2011 -0600 @@ -63,7 +63,7 @@ $ hg rebase -s 1 -d 4 --keep merging A warning: conflicts during merge. - merging A failed! + merging A incomplete! (edit conflicts, then use 'hg resolve --mark') abort: unresolved conflicts (see hg resolve, then hg rebase --continue) [255] @@ -115,7 +115,7 @@ $ hg rebase -s 5 -d 4 --keepbranches merging A warning: conflicts during merge. - merging A failed! + merging A incomplete! (edit conflicts, then use 'hg resolve --mark') abort: unresolved conflicts (see hg resolve, then hg rebase --continue) [255]