Signed-off-by: Bert Wesarg <bert.wesarg@xxxxxxxxxxxxxx>
---
lib/diff.tcl | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/lib/diff.tcl b/lib/diff.tcl
index 2290919..91ed7c6 100644
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@@ -382,6 +382,8 @@ proc read_diff {fd conflict_size cont_info} {
foreach {line markup} [parse_color_line $line] break
set line [string map {\033 ^} $line]
+ set tags {}
+
# -- Check for start of diff header.
if { [string match {diff --git *} $line]
|| [string match {diff --cc *} $line]
@@ -426,7 +428,6 @@ proc read_diff {fd conflict_size cont_info} {
|| [string match {Binary files * and * differ} $line]
|| $line eq {\ No newline at end of file}
|| [regexp {^\* Unmerged path } $line]} {
- set tags {}
} elseif {$is_3way_diff} {
set op [string range $line 0 1]
switch -- $op {
--
1.7.3.2.1200.ge4bf6
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html