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

merge: insert a separator into user configured tools and internals

Changeset 621c8ae5acb1…

Parent 55b9af63c5cc…

by Yuki KODAMA

Changes to one file · Browse files at 621c8ae5acb1 Showing diff from parent 55b9af63c5cc Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​merge.py Stacked
 
79
80
81
 
82
83
 
 
 
84
85
86
 
79
80
81
82
83
 
84
85
86
87
88
89
@@ -79,8 +79,11 @@
  self.mergelabel = lbl   self.action_area.add(lbl)   self.action_area.add(combo) + prev = False   for tool in hglib.mergetools(repo.ui): - vlist.append((hglib.toutf(tool), False)) + cur = tool.startswith('internal:') + vlist.append((hglib.toutf(tool), prev != cur)) + prev = cur   mtool = repo.ui.config('ui', 'merge', None)   if mtool:   combo.child.set_text(hglib.toutf(mtool))