Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.1, 2.0.2, and 2.0.3

stable merge: use plural form of (n)tool

Changeset c33cf0de7cf1…

Parent 42dee35e75ff…

by timeless

Changes to one file · Browse files at c33cf0de7cf1 Showing diff from parent 42dee35e75ff Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
399
400
401
402
 
403
404
405
 
399
400
401
 
402
403
404
405
@@ -399,7 +399,7 @@
  labels=labels, parent=self):   o = self.cmd.outputLog   o.appendLog(_('Canceling merge...\n'), 'control') - o.appendLog(_('(Please close any running merge tool)\n'), 'control') + o.appendLog(_('(Please close any running merge tools)\n'), 'control')   self.cmd.cancel()     def isComplete(self):