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 8aa20ec48054…

Parents 4adc072c6448…

Parents 4119e9f4e47b…

by Steve Borho

Changes to 3 files · Browse files at 8aa20ec48054 Showing diff from parent 4adc072c6448 4119e9f4e47b Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​mergetools.rc Stacked
 
30
31
32
 
33
34
35
 
30
31
32
33
34
35
36
@@ -30,6 +30,7 @@
 kdiff3.regkey=Software\KDiff3  kdiff3.regappend=\kdiff3.exe  kdiff3.fixeol=True +kdiff3.premerge=False  kdiff3.gui=True  kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child  kdiff3.diff3args=--L1 '$plabel1' --L2 '$clabel' --L3 '$plabel2' $parent1 $child $parent2
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​merge.py Stacked
 
81
82
83
 
 
 
 
 
84
85
86
87
88
89
90
91
92
93
94
95
96
 
81
82
83
84
85
86
87
88
89
90
91
92
93
 
 
 
 
 
94
95
96
@@ -81,16 +81,16 @@
  self.otherframe = info   self.otherrev = str(info.get_data('revnum'))   + discard = gtk.CheckButton(_('Discard all changes from merge target ' + '(other) revision')) + self.discard = discard + self.vbox.pack_start(discard, False, False) +   info = factory(rev0, style={'label': _('Current revision (local)')})   self.vbox.pack_start(info, False, False)   self.localframe = info   self.localrev = str(info.get_data('revnum'))   - discard = gtk.CheckButton(_('Discard all changes from merge target ' - '(other) revision')) - self.discard = discard - self.vbox.pack_start(discard, False, False) -   vlist = gtk.ListStore(str, # tool name   bool) # separator   combo = gtk.ComboBoxEntry(vlist, 0)
Change 1 of 2 Show Entire File tortoisehg/​hgtk/​visdiff.py Stacked
 
161
162
163
164
 
165
166
167
 
180
181
182
183
 
 
184
185
186
 
161
162
163
 
164
165
166
167
 
180
181
182
 
183
184
185
186
187
@@ -161,7 +161,7 @@
    # Build tool list based on diff-patterns matches   toollist = set() - patterns = ui.configitems('diff-patterns') + patterns = repo.ui.configitems('diff-patterns')   patterns = [(p, t) for p,t in patterns if t in detectedtools]   for path in MAR:   for pat, tool in patterns: @@ -180,7 +180,8 @@
  break   else:   hascopies = False - if len(toollist) > 1 or hascopies: + force = repo.ui.configbool('tortoisehg', 'forcevdiffwin') + if len(toollist) > 1 or hascopies or force:   usewin = True   else:   preferred = toollist.pop()