Mercurial > hg-stable

changeset 2896:834e147842d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
trivial bool() cleanup
author Matt Mackall <mpm@selenic.com>
date Tue, 15 Aug 2006 18:12:36 -0500
parents 21631c2c09a5
children dd032b0f02ac
files mercurial/merge.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)))