diff options
| author |  Bert Wesarg <bert.wesarg@googlemail.com> | 2010-12-09 21:47:57 +0100 |
|---|---|---|
| committer |  Pat Thoyts <patthoyts@users.sourceforge.net> | 2011-01-28 09:01:17 +0000 |
| commit | 6459d7c046e5ab618ffde2d5a04dc83b5f97a600 (patch) | |
| tree | 470257f18defe34e53e11c46a6343eabf38c9b46 | |
| parent | git-gui: move 3way diff autodetect up (diff) | |
| download | tgif-6459d7c046e5ab618ffde2d5a04dc83b5f97a600.tar.xz | |
git-gui: always reset the current tag
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| -rw-r--r-- | lib/diff.tcl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/diff.tcl b/lib/diff.tcl index 22909194d9..91ed7c638c 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 { |