Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

stable visdiff: only remove rev options for extdiff if change is actually defined

Changeset 67d73a7d8f80…

Parent 171990177c08…

by Henrik Stuart

Changes to one file · Browse files at 67d73a7d8f80 Showing diff from parent 171990177c08 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​visdiff.py Stacked
 
383
384
385
386
 
387
388
389
 
383
384
385
 
386
387
388
389
@@ -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: