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

update: improve warning message

Changeset 90c2405be840…

Parent 6c7ca8aeff3d…

by Steve Borho

Changes to one file · Browse files at 90c2405be840 Showing diff from parent 6c7ca8aeff3d Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​update.py Stacked
 
264
265
266
267
 
268
269
270
 
264
265
266
 
267
268
269
270
@@ -264,7 +264,7 @@
  elif ret['merge']:   pass # no args   elif ret['cancel']: - self.cmd.log.append(_('[user canceled]\n'), error=True) + self.cmd.log.append(_('[canceled by user]\n'), error=True)   self.switch_to(MODE_WORKING)   self.abort()   return