Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8.1, 0.8.2, and 0.8.3

merge: reverse button order

Fixes #392

Changeset 60c8419346dc…

Parent 6b4d52313cd3…

by Steve Borho

Changes to one file · Browse files at 60c8419346dc Showing diff from parent 6b4d52313cd3 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​merge.py Stacked
 
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
 
91
92
 
 
 
93
 
94
95
96
 
97
98
99
 
74
75
76
 
77
78
 
79
80
81
 
82
83
84
85
86
87
88
89
 
90
91
92
93
94
95
96
 
97
98
99
100
@@ -74,26 +74,27 @@
  key, modifier = gtk.accelerator_parse('Escape')   close.add_accelerator('clicked', accelgroup, key, 0,   gtk.ACCEL_VISIBLE) - hbbox.add(close)     undo = gtk.Button(_('Undo')) - hbbox.add(undo)   undo.set_sensitive(False)     commit = gtk.Button(_('Commit')) - hbbox.add(commit)   commit.set_sensitive(False)     merge = gtk.Button(_('Merge'))   key, modifier = gtk.accelerator_parse(mod+'Return')   merge.add_accelerator('clicked', accelgroup, key, modifier,   gtk.ACCEL_VISIBLE) +   hbbox.add(merge) - merge.grab_focus() + hbbox.add(commit) + hbbox.add(undo) + hbbox.add(close)   + commit.connect('clicked', self.commit)   undo.connect('clicked', self.undo, local, merge, commit)   merge.connect('clicked', self.merge, other, commit, undo) - commit.connect('clicked', self.commit) + merge.grab_focus()     def revdesc(self, repo, revid):   ctx = repo[revid]