Show More
@@ -429,7 +429,7 b' def dorecord(ui, repo, commitfunc, *pats' | |||||
429 | merge = len(repo[None].parents()) > 1 |
|
429 | merge = len(repo[None].parents()) > 1 | |
430 | if merge: |
|
430 | if merge: | |
431 | raise util.Abort(_('cannot partially commit a merge ' |
|
431 | raise util.Abort(_('cannot partially commit a merge ' | |
432 | '(use hg commit instead)')) |
|
432 | '(use "hg commit" instead)')) | |
433 |
|
433 | |||
434 | changes = repo.status(match=match)[:3] |
|
434 | changes = repo.status(match=match)[:3] | |
435 | diffopts = mdiff.diffopts(git=True, nodates=True) |
|
435 | diffopts = mdiff.diffopts(git=True, nodates=True) |
@@ -883,7 +883,7 b' Abort early when a merge is in progress' | |||||
883 | (branch merge, don't forget to commit) |
|
883 | (branch merge, don't forget to commit) | |
884 |
|
884 | |||
885 | $ hg record -m'will abort' |
|
885 | $ hg record -m'will abort' | |
886 | abort: cannot partially commit a merge (use hg commit instead) |
|
886 | abort: cannot partially commit a merge (use "hg commit" instead) | |
887 | [255] |
|
887 | [255] | |
888 |
|
888 | |||
889 | $ hg up -C |
|
889 | $ hg up -C |
General Comments 0
You need to be logged in to leave comments.
Login now