Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset ed8ed3c55ee2…

Parents 1aef589579fe…

Parents c769bbbf1af7…

by Steve Borho

Changes to one file · Browse files at ed8ed3c55ee2 Showing diff from parent 1aef589579fe c769bbbf1af7 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​visdiff.py Stacked
 
204
205
206
207
208
209
 
 
 
 
 
 
 
 
 
210
211
212
 
204
205
206
 
 
 
207
208
209
210
211
212
213
214
215
216
217
218
@@ -204,9 +204,15 @@
  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