Show More
@@ -1315,7 +1315,7 b' class localrepository(object):' | |||||
1315 | wctx = self[None] |
|
1315 | wctx = self[None] | |
1316 | merge = len(wctx.parents()) > 1 |
|
1316 | merge = len(wctx.parents()) > 1 | |
1317 |
|
1317 | |||
1318 |
if |
|
1318 | if not force and merge and not match.always(): | |
1319 | raise util.Abort(_('cannot partially commit a merge ' |
|
1319 | raise util.Abort(_('cannot partially commit a merge ' | |
1320 | '(do not specify files or patterns)')) |
|
1320 | '(do not specify files or patterns)')) | |
1321 |
|
1321 |
General Comments 0
You need to be logged in to leave comments.
Login now