# HG changeset patch
# User Henrik Stuart <henrik.stu...@edlund.dk>
# Date 1256900701 -3600
# Branch stable
# Node ID 926e4b04ffef7e4736bacada5215060126c31cfe
# Parent 171990177c086cab7ce964bfebe518c0c8f69d04
visdiff: only remove rev options for extdiff if change is actually defined
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.get('rev'):
+ if 'change' in opts and opts['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
