git-gui: Fix use of renamed tag.
The d======= was renamed to d= in 4590307. Fix this. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Bert Wesarg committed
Nov 29, 2010 at 09:21 UTC
c7ec31a36e6309be1392ea58948303286665fdd9
1 file changed
+4
-4
lib/diff.tcl
+4
-4
@@ -122,22 +122,22 @@ proc show_unmerged_diff {cont_info} {
122
if {$merge_stages(2) eq {}} {
123
set is_conflict_diff 1
124
lappend current_diff_queue \
125
- [list [mc "LOCAL: deleted\nREMOTE:\n"] d======= \
125
+ [list [mc "LOCAL: deleted\nREMOTE:\n"] d= \
126
[list ":1:$current_diff_path" ":3:$current_diff_path"]]
127
} elseif {$merge_stages(3) eq {}} {
128
set is_conflict_diff 1
129
lappend current_diff_queue \
130
- [list [mc "REMOTE: deleted\nLOCAL:\n"] d======= \
130
+ [list [mc "REMOTE: deleted\nLOCAL:\n"] d= \
131
[list ":1:$current_diff_path" ":2:$current_diff_path"]]
132
} elseif {[lindex $merge_stages(1) 0] eq {120000}
133
|| [lindex $merge_stages(2) 0] eq {120000}
134
|| [lindex $merge_stages(3) 0] eq {120000}} {
135
set is_conflict_diff 1
136
lappend current_diff_queue \
137
- [list [mc "LOCAL:\n"] d======= \
137
+ [list [mc "LOCAL:\n"] d= \
138
[list ":1:$current_diff_path" ":2:$current_diff_path"]]
139
lappend current_diff_queue \
140
- [list [mc "REMOTE:\n"] d======= \
140
+ [list [mc "REMOTE:\n"] d= \
141
[list ":1:$current_diff_path" ":3:$current_diff_path"]]
142
} else {
143
start_show_diff $cont_info