Skip to content

Commit

Permalink
git-gui: handle "deleted symlink" diff marker
Browse files Browse the repository at this point in the history
Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  • Loading branch information
Michele Ballabio authored and Shawn O. Pearce committed Sep 9, 2007
1 parent 2d19f8e commit 4ed1a19
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions lib/diff.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -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]} {
Expand Down

0 comments on commit 4ed1a19

Please sign in to comment.