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

merge: allow resolve message to wrap when necessary

Changeset 154a0bfafcd5…

Parent a2b311fa5405…

by Steve Borho

Changes to one file · Browse files at 154a0bfafcd5 Showing diff from parent a2b311fa5405 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
348
349
350
 
351
352
353
 
543
544
545
 
546
547
548
 
348
349
350
351
352
353
354
 
544
545
546
547
548
549
550
@@ -348,6 +348,7 @@
    self.reslabel = QLabel()   self.reslabel.linkActivated.connect(self.onLinkActivated) + self.reslabel.setWordWrap(True)   self.layout().addWidget(self.reslabel)     def currentPage(self): @@ -543,6 +544,7 @@
  self.repo.decrementBusyCount()   self.completeChanged.emit()   +  class ResultPage(BasePage):   # TODO: Add a checkbox on this page to make it optional