Show More
@@ -1361,7 +1361,8 b' def merge(repo, subset, x):' | |||||
1361 | # i18n: "merge" is a keyword |
|
1361 | # i18n: "merge" is a keyword | |
1362 | getargs(x, 0, 0, _("merge takes no arguments")) |
|
1362 | getargs(x, 0, 0, _("merge takes no arguments")) | |
1363 | cl = repo.changelog |
|
1363 | cl = repo.changelog | |
1364 | return subset.filter(lambda r: cl.parentrevs(r)[1] != -1, |
|
1364 | nullrev = node.nullrev | |
|
1365 | return subset.filter(lambda r: cl.parentrevs(r)[1] != nullrev, | |||
1365 | condrepr='<merge>') |
|
1366 | condrepr='<merge>') | |
1366 |
|
1367 | |||
1367 | @predicate('branchpoint()', safe=True) |
|
1368 | @predicate('branchpoint()', safe=True) |
General Comments 0
You need to be logged in to leave comments.
Login now