diff options
Diffstat (limited to 'git-gui.sh')
| -rwxr-xr-x | git-gui.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-gui.sh b/git-gui.sh index bbf57b96a..54204aee7 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -706,6 +706,7 @@ proc read_diff {fd} { || [string match {mode *} $line] || [string match {new file *} $line] || [string match {deleted file *} $line] + || $line eq {\ No newline at end of file} || [regexp {^\* Unmerged path } $line]} { set tags {} } elseif {$is_3way_diff} { |