diff options
| author | Bert Wesarg <bert.wesarg@googlemail.com> | 2010-11-29 09:21:57 +0100 |
|---|---|---|
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | 2010-12-06 21:09:53 +0000 |
| commit | c7ec31a36e6309be1392ea58948303286665fdd9 (patch) | |
| tree | 97c3bb914ad87024d9a29111616d76b6b359c5b9 | |
| parent | 1ab862862fb985131ae081ddde4d8f8b7e23c17b (diff) | |
| download | git-c7ec31a36e6309be1392ea58948303286665fdd9.tar.gz git-c7ec31a36e6309be1392ea58948303286665fdd9.tar.xz | |
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>
| -rw-r--r-- | lib/diff.tcl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/diff.tcl b/lib/diff.tcl index 8fea9477a..7b1fddf49 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 |