Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git-gui: Do not munge conflict marker lines in a normal diff
[gitweb.git]
/
lib
/
diff.tcl
diff --git
a/lib/diff.tcl
b/lib/diff.tcl
index bdcbbf86e9f9b038e22cf689b89004c441983c5f..94ee38cccc1ee9a43f8dd1309353609b283d8af5 100644
(file)
--- a/
lib/diff.tcl
+++ b/
lib/diff.tcl
@@
-377,7
+377,6
@@
proc read_diff {fd cont_info} {
{+} {
if {[regexp {^\+([<>]{7} |={7})} $line _g op]} {
set is_conflict_diff 1
- set line [string replace $line 0 0 { }]
set tags d$op
} else {
set tags d_+