Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

merge: add link to open Status dialog

Changeset e7f481ed664f…

Parent ad03f90f1a6c…

by Yuki KODAMA

Changes to one file · Browse files at e7f481ed664f Showing diff from parent ad03f90f1a6c Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
510
511
512
513
 
514
515
516
 
538
539
540
 
 
541
542
543
 
510
511
512
 
513
514
515
516
 
538
539
540
541
542
543
544
545
@@ -510,7 +510,7 @@
  def markup_func(widget, item, value):   if item == 'rev':   text, rev = value - return '%s (%s)' % (text, rev) + return '<a href="view">%s</a> (%s)' % (text, rev)   elif item == 'parents':   def branch_markup(branch):   opts = dict(fg='black', bg='#aaffaa') @@ -538,6 +538,8 @@
  box.addWidget(rev_sep)   rev_info = csinfo.create(repo, None, style, custom=custom,   withupdate=True) + page = self.wizard().page(MERGE_PAGE) + rev_info.linkActivated.connect(page.link_activated)   box.addWidget(rev_info)     # commit message area