# HG changeset patch
# User Sune Foldager <c...@cyanite.org>
# Date 1257114577 -3600
# Branch stable
# Node ID 54ba3a46df3278eeb0ec530470db54058bd82314
# Parent 393df20e3c8d323a29bbb031b8b7b2a17d41ad98
visdiff: simplify expression
diff --git a/tortoisehg/hgtk/visdiff.py b/tortoisehg/hgtk/visdiff.py
--- a/tortoisehg/hgtk/visdiff.py
+++ b/tortoisehg/hgtk/visdiff.py
@@ -383,7 +383,7 @@
# if both --change and --rev is given, remove --rev in 3-way mode,
# and --change in normal mode
- if 'change' in opts and opts['change'] and opts.get('rev'):
+ if opts.get('change') and opts.get('rev'):
if '$parent2' in ''.join(diffopts):
del opts['rev']
else:
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Tortoisehg-develop mailing list
Tortoisehg-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
