# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1155683556 18000
# Node ID 834e147842d70f21b5e3881b2a49992707a5efb0
# Parent  21631c2c09a5f8a48a3c17091b17b327fd6db19d
trivial bool() cleanup

diff -r 21631c2c09a5 -r 834e147842d7 mercurial/merge.py
--- a/mercurial/merge.py	Tue Aug 15 16:28:00 2006 -0500
+++ b/mercurial/merge.py	Tue Aug 15 18:12:36 2006 -0500
@@ -103,7 +103,7 @@
     # we care about merging
     repo.ui.note(_("resolving manifests\n"))
     repo.ui.debug(_(" overwrite %s branchmerge %s partial %s linear %s\n") %
-                  (overwrite, branchmerge, partial and True or False, linear_path))
+                  (overwrite, branchmerge, bool(partial), linear_path))
     repo.ui.debug(_(" ancestor %s local %s remote %s\n") %
                   (short(man), short(m1n), short(m2n)))