Show More
@@ -992,7 +992,7 b' def merge(repo, subset, x):' | |||||
992 | # i18n: "merge" is a keyword |
|
992 | # i18n: "merge" is a keyword | |
993 | getargs(x, 0, 0, _("merge takes no arguments")) |
|
993 | getargs(x, 0, 0, _("merge takes no arguments")) | |
994 | cl = repo.changelog |
|
994 | cl = repo.changelog | |
995 |
return |
|
995 | return lazyset(subset, lambda r: cl.parentrevs(r)[1] != -1) | |
996 |
|
996 | |||
997 | def branchpoint(repo, subset, x): |
|
997 | def branchpoint(repo, subset, x): | |
998 | """``branchpoint()`` |
|
998 | """``branchpoint()`` |
General Comments 0
You need to be logged in to leave comments.
Login now