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

stable chunks: use hglib.tounicode() to show reject line (closes #166)

Changeset b0fd8b812cc6…

Parent 783790538f8b…

by Steve Borho

Changes to one file · Browse files at b0fd8b812cc6 Showing diff from parent 783790538f8b Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​chunks.py Stacked
 
117
118
119
120
 
121
122
123
 
117
118
119
 
120
121
122
123
@@ -117,7 +117,7 @@
  for line in ui.popbuffer().splitlines():   if line.endswith(wfile + '.rej'):   if qtlib.QuestionMsgBox(_('Manually resolve rejected chunks?'), - unicode(line) + u'<br><br>' + + hglib.tounicode(line) + u'<br><br>' +   _('Edit patched file and rejects?'),   parent=self):   #wctxactions.edit(self, repo.ui, repo, [wfile, wfile+'.rej'])