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

status: always show merge state, unless viewing changesets

Doing an update with working copy modifications also uses the merge machinery,
so you can have unresolved merges in your working directory without calling 'hg
merge'

Changeset bac6b73d51b3…

Parent cccd006af970…

by Steve Borho

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

Change 1 of 1 Show Entire File hggtk/​status.py Stacked
 
321
322
323
324
 
325
326
327
 
321
322
323
 
324
325
326
327
@@ -321,7 +321,7 @@
  col1.set_resizable(False)   self.filetree.append_column(col1)   - if self.merging: + if self.count_revs() <= 1:   col = gtk.TreeViewColumn(_('ms'), stat_cell)   col.add_attribute(stat_cell, 'text', FM_MERGE_STATUS)   col.set_sort_column_id(4)