Show More
@@ -962,7 +962,7 b' class queue(object):' | |||
|
962 | 962 | m, a, r, d = repo.status(match=match)[:4] |
|
963 | 963 | else: |
|
964 | 964 | m, a, r, d = self.checklocalchanges(repo, force=True) |
|
965 |
|
|
|
965 | match = scmutil.matchfiles(repo, m + a + r + inclsubs) | |
|
966 | 966 | if len(repo[None].parents()) > 1: |
|
967 | 967 | raise util.Abort(_('cannot manage merge changesets')) |
|
968 | 968 | commitfiles = m + a + r |
General Comments 0
You need to be logged in to leave comments.
Login now