Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

Merge with stable

Changeset edaf61d90a5d…

Parents aa5c8712e0e6…

Parents 56b6667b2817…

by Yuki KODAMA

Changes to one file · Browse files at edaf61d90a5d Showing diff from parent aa5c8712e0e6 56b6667b2817 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​status.py Stacked
 
1366
1367
1368
1369
 
1370
1371
1372
 
1366
1367
1368
 
1369
1370
1371
1372
@@ -1366,7 +1366,7 @@
  text = '\n'.join(files[:5])   if len(files) > 5:   text += ' ...\n' - return text + return hglib.toutf(text)     if self.is_merge():   res = gdialog.CustomPrompt(