diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2007-01-21 23:11:47 -0500 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-01-21 23:11:47 -0500 |
| commit | 8ce03164842d250f1cf1dfbf9a245fd030195e24 (patch) | |
| tree | d37444315437e7260d4b5bdd50b75ae7ec85aed8 /git-gui.sh | |
| parent | git-gui: Create missing branch head on initial commit. (diff) | |
| download | tgif-8ce03164842d250f1cf1dfbf9a245fd030195e24.tar.xz | |
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>
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 d71fcd8220..396a44e654 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -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} { |