Show More
@@ -2428,7 +2428,7 b' def amend(ui, repo, old, extra, pats, op' | |||
|
2428 | 2428 | if len(old.parents()) > 1: |
|
2429 | 2429 | # ctx.files() isn't reliable for merges, so fall back to the |
|
2430 | 2430 | # slower repo.status() method |
|
2431 |
files = set([fn for st in |
|
|
2431 | files = set([fn for st in base.status(old)[:3] | |
|
2432 | 2432 | for fn in st]) |
|
2433 | 2433 | else: |
|
2434 | 2434 | files = set(old.files()) |
General Comments 0
You need to be logged in to leave comments.
Login now