Re: [PATCH] git-gui: Fix use of renamed tag.
From: Pat Thoyts <hidden>
Date: 2016-06-15 22:50:11
Bert Wesarg [off-list ref] writes:
quoted hunk
The d======= was renamed to d= in 4590307. Fix this. Signed-off-by: Bert Wesarg <redacted> --- lib/diff.tcl | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)diff --git a/lib/diff.tcl b/lib/diff.tcl index 8fea947..7b1fddf 100644 --- a/lib/diff.tcl +++ b/lib/diff.tcl@@ -122,22 +122,22 @@ proc show_unmerged_diff {cont_info} {if {$merge_stages(2) eq {}} { set is_conflict_diff 1 lappend current_diff_queue \ - [list [mc "LOCAL: deleted\nREMOTE:\n"] d======= \ + [list [mc "LOCAL: deleted\nREMOTE:\n"] d= \ [list ":1:$current_diff_path" ":3:$current_diff_path"]] } elseif {$merge_stages(3) eq {}} { set is_conflict_diff 1 lappend current_diff_queue \ - [list [mc "REMOTE: deleted\nLOCAL:\n"] d======= \ + [list [mc "REMOTE: deleted\nLOCAL:\n"] d= \ [list ":1:$current_diff_path" ":2:$current_diff_path"]] } elseif {[lindex $merge_stages(1) 0] eq {120000} || [lindex $merge_stages(2) 0] eq {120000} || [lindex $merge_stages(3) 0] eq {120000}} { set is_conflict_diff 1 lappend current_diff_queue \ - [list [mc "LOCAL:\n"] d======= \ + [list [mc "LOCAL:\n"] d= \ [list ":1:$current_diff_path" ":2:$current_diff_path"]] lappend current_diff_queue \ - [list [mc "REMOTE:\n"] d======= \ + [list [mc "REMOTE:\n"] d= \ [list ":1:$current_diff_path" ":3:$current_diff_path"]] } else { start_show_diff $cont_info
Looks correct. Thank you. -- Pat Thoyts http://www.patthoyts.tk/ PGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0 B9 DD