diff options
| author | Michele Ballabio <barra_cuda@katamail.com> | 2007-09-09 21:09:07 +0200 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-09-09 19:47:26 -0400 |
| commit | 4ed1a190d09c7d6a248038edb11addda77af7550 (patch) | |
| tree | 3a88ab662a227fb4c122e75831d4920034e41e56 | |
| parent | 2d19f8e921a1cdc562783814747819b0d5a12641 (diff) | |
| download | git-4ed1a190d09c7d6a248038edb11addda77af7550.tar.gz git-4ed1a190d09c7d6a248038edb11addda77af7550.tar.xz | |
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>
| -rw-r--r-- | lib/diff.tcl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/diff.tcl b/lib/diff.tcl index 9eeff2ed3..a1d5e523d 100644 --- a/lib/diff.tcl +++ b/lib/diff.tcl @@ -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]} { |