1. TortoiseHg
  2. TortoiseHg
  3. thg

Commits

Steve Borho  committed c769bbb

visdiff: toggle to second parent when diff tool refuses three-way diff

Closes #1023

  • Participants
  • Parent commits 374d40d
  • Branches stable

Comments (0)

Files changed (1)

File tortoisehg/hgtk/visdiff.py

View file
     diffcmd, diffopts, mergeopts = detectedtools[preferred]
 
     # Disable 3-way merge if there is only one parent or no tool support
-    do3way = bool(mergeopts) and ctx1b is not None
-    if do3way:
-        args = mergeopts
+    do3way = False
+    if ctx1b:
+        if mergeopts:
+            do3way = True
+            args = mergeopts
+        else:
+            args = diffopts
+            if str(ctx1b.rev()) in revs:
+                ctx1a = ctx1b
     else:
         args = diffopts