Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git-gui: Correctly ignore '* Unmerged path' during diff.
[gitweb.git]
/
git-gui.sh
diff --git
a/git-gui.sh
b/git-gui.sh
index d26868beca6a290bfe033d4b2318769d03e3d328..8e664f54e8a462aaea4490c33d761fb933c15649 100755
(executable)
--- a/
git-gui.sh
+++ b/
git-gui.sh
@@
-708,7
+708,8
@@
proc read_diff {fd} {
#
if {[string match {@@@ *} $line]} {set is_3way_diff 1}
- if {[string match {index *} $line]} {
+ if {[string match {index *} $line]
+ || [regexp {^\* Unmerged path } $line]} {
set tags {}
} elseif {$is_3way_diff} {
set op [string range $line 0 1]