Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

merge: cleanup imports

Changeset 2a6db97a7aba…

Parent deb9afd9eccd…

by Steve Borho

Changes to one file · Browse files at 2a6db97a7aba Showing diff from parent deb9afd9eccd Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
7
8
9
10
11
12
13
 
17
18
19
20
21
22
23
24
 
504
505
506
507
 
508
509
510
 
7
8
9
 
10
11
12
 
16
17
18
 
 
19
20
21
 
501
502
503
 
504
505
506
507
@@ -7,7 +7,6 @@
 # GNU General Public License version 2, incorporated herein by reference.    from mercurial import hg, error -from mercurial import merge as mergemod    from tortoisehg.util import hglib  from tortoisehg.hgqt.i18n import _ @@ -17,8 +16,6 @@
 from PyQt4.QtCore import *  from PyQt4.QtGui import *   -keep = i18n.keepgettext() -  SUMMARY_PAGE = 0  MERGE_PAGE = 1  COMMIT_PAGE = 2 @@ -504,7 +501,7 @@
  def currentPage(self):   # TODO: add other branch name, when appropriate   engmsg = self.repo.ui.configbool('tortoisehg', 'engmsg', False) - msgset = keep._('Merge ') + msgset = i18n.keepgettext()._('Merge ')   self.msgEntry.setText(engmsg and msgset['id'] or msgset['str'])   self.msgEntry.moveCursorToEnd()