# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1560086302 -32400
# Node ID d279e4f453c4b3d05b70df0c1d2c2cf0046a45fc
# Parent  aae93201f75888deac664d16e01af3c4bc76ac22
revset: use nullrev constant in merge()

diff -r aae93201f758 -r d279e4f453c4 mercurial/revset.py
--- a/mercurial/revset.py	Fri May 31 22:38:04 2019 -0700
+++ b/mercurial/revset.py	Sun Jun 09 22:18:22 2019 +0900
@@ -1361,7 +1361,8 @@
     # i18n: "merge" is a keyword
     getargs(x, 0, 0, _("merge takes no arguments"))
     cl = repo.changelog
-    return subset.filter(lambda r: cl.parentrevs(r)[1] != -1,
+    nullrev = node.nullrev
+    return subset.filter(lambda r: cl.parentrevs(r)[1] != nullrev,
                          condrepr='<merge>')
 
 @predicate('branchpoint()', safe=True)