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

status: better labels for view options when merging

view right -> edit (manually resolve conflct markers)
view left -> view other (edit temp file with 'other' content)

Changeset 52c295a055d6…

Parent 88e99ef8b874…

by Steve Borho

Changes to one file · Browse files at 52c295a055d6 Showing diff from parent 88e99ef8b874 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​status.py Stacked
 
73
74
75
76
77
 
 
78
79
80
 
104
105
106
107
108
 
 
109
110
111
112
113
114
115
116
 
 
117
118
119
 
73
74
75
 
 
76
77
78
79
80
 
104
105
106
 
 
107
108
109
110
111
112
113
114
 
 
115
116
117
118
119
@@ -73,8 +73,8 @@
  return (   # merge   ((_('_difference'), self._diff_file), - (_('_view right'), self._view_file), - (_('view _left'), self._view_left_file), + (_('edit'), self._view_file), + (_('view other'), self._view_left_file),   (_('_revert'), self._revert_file),   (_('l_og'), self._log_file)),   # addrem @@ -104,16 +104,16 @@
  (_('l_og'), self._log_file)),   # unresolved   ((_('_difference'), self._diff_file), - (_('_view right'), self._view_file), - (_('view _left'), self._view_left_file), + (_('edit'), self._view_file), + (_('view other'), self._view_left_file),   (_('_revert'), self._revert_file),   (_('l_og'), self._log_file),   (_('resolve'), self._do_resolve),   (_('mark resolved'), self._mark_resolved)),   # resolved   ((_('_difference'), self._diff_file), - (_('_view right'), self._view_file), - (_('view _left'), self._view_left_file), + (_('edit'), self._view_file), + (_('view other'), self._view_left_file),   (_('_revert'), self._revert_file),   (_('l_og'), self._log_file),   (_('mark unresolved'), self._unmark_resolved)),