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

Merge with stable

Changeset d9f1484734f9…

Parents 5009094bb582…

Parents 57224ab9877c…

by Steve Borho

Changes to one file · Browse files at d9f1484734f9 Showing diff from parent 5009094bb582 57224ab9877c Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
281
282
283
284
 
285
286
287
 
281
282
283
 
284
285
286
287
@@ -281,7 +281,7 @@
  else:   self.groups.set_visible(False, 'dirty')   self.groups.set_visible(False, 'merged') - self.wd_status.set_status(_('Clean'), True) + self.wd_status.set_status(_('Clean', 'working dir state'), True)   self.completeChanged.emit()     @pyqtSlot(QString)