Show More
@@ -2944,6 +2944,9 b' class localrepository(object):' | |||
|
2944 | 2944 | self, status, text, user, date, extra |
|
2945 | 2945 | ) |
|
2946 | 2946 | |
|
2947 | ms = mergemod.mergestate.read(self) | |
|
2948 | mergeutil.checkunresolved(ms) | |
|
2949 | ||
|
2947 | 2950 | # internal config: ui.allowemptycommit |
|
2948 | 2951 | allowemptycommit = ( |
|
2949 | 2952 | wctx.branch() != wctx.p1().branch() |
@@ -2958,9 +2961,6 b' class localrepository(object):' | |||
|
2958 | 2961 | if merge and cctx.deleted(): |
|
2959 | 2962 | raise error.Abort(_(b"cannot commit merge with missing files")) |
|
2960 | 2963 | |
|
2961 | ms = mergemod.mergestate.read(self) | |
|
2962 | mergeutil.checkunresolved(ms) | |
|
2963 | ||
|
2964 | 2964 | if editor: |
|
2965 | 2965 | cctx._text = editor(self, cctx, subs) |
|
2966 | 2966 | edited = text != cctx._text |
@@ -347,8 +347,8 b' Try to make empty commit while there are' | |||
|
347 | 347 | $ hg revert -r . a |
|
348 | 348 | $ rm a.orig |
|
349 | 349 | $ hg ci -m empty |
|
350 | nothing changed | |
|
351 |
[ |
|
|
350 | abort: unresolved merge conflicts (see 'hg help resolve') | |
|
351 | [255] | |
|
352 | 352 | $ hg resolve -m a |
|
353 | 353 | (no more unresolved files) |
|
354 | 354 | $ hg resolve -l |
General Comments 0
You need to be logged in to leave comments.
Login now