Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

status: clear merge diff pane when no files are diffable

Changeset 1fd77196ca68…

Parent e07e20da1735…

by Steve Borho

Changes to one file · Browse files at 1fd77196ca68 Showing diff from parent e07e20da1735 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​status.py Stacked
 
600
601
602
 
 
 
 
603
604
605
 
600
601
602
603
604
605
606
607
608
609
@@ -600,6 +600,10 @@
  files = [row[FM_PATH] for row in self.filemodel]   self._show_diff_hunks(files)   + # clear buffer after a merge commit + if not files and hasattr(self, 'merge_diff_text'): + self.merge_diff_text.set_buffer(gtk.TextBuffer()) +   self.filetree.show()   if self.mode == 'commit':   self.text.grab_focus()