зеркало из https://github.com/microsoft/git.git
git-gui: Don't format the mode line of a diff.
We sometimes see a mode line show up in a diff if the file mode was changed. But its not something we format specially. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Родитель
f5925d934f
Коммит
8ce0316484
|
@ -709,6 +709,7 @@ proc read_diff {fd} {
|
|||
if {[string match {@@@ *} $line]} {set is_3way_diff 1}
|
||||
|
||||
if {[string match {index *} $line]
|
||||
|| [string match {mode *} $line]
|
||||
|| [regexp {^\* Unmerged path } $line]} {
|
||||
set tags {}
|
||||
} elseif {$is_3way_diff} {
|
||||
|
|
Загрузка…
Ссылка в новой задаче