mirror of
https://github.com/git-for-windows/git.git
synced 2026-05-04 08:40:19 -05:00
git-gui: handle "deleted symlink" diff marker
Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
committed by
Shawn O. Pearce
parent
2d19f8e921
commit
4ed1a190d0
@@ -203,6 +203,7 @@ proc read_diff {fd} {
|
||||
if {[string match {mode *} $line]
|
||||
|| [string match {new file *} $line]
|
||||
|| [string match {deleted file *} $line]
|
||||
|| [string match {deleted symlink} $line]
|
||||
|| [string match {Binary files * and * differ} $line]
|
||||
|| $line eq {\ No newline at end of file}
|
||||
|| [regexp {^\* Unmerged path } $line]} {
|
||||
|
||||
Reference in New Issue
Block a user