diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-03-21 09:25:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-03-21 09:25:58 -0700 |
| commit | 6e8d538aab8fe4dd07ba9fb87b5c7edcfa5706ad (patch) | |
| tree | e2021a881ddddc19d3959d2f2c2f6476f7f726d9 /git-gui/lib/diff.tcl | |
| parent | b70a02dcc9add838175b4c4a07171f8ab6b9f7c0 (diff) | |
| parent | bb52cdac6254c006e06bf0bb820268dcf024fc22 (diff) | |
| download | git-6e8d538aab8fe4dd07ba9fb87b5c7edcfa5706ad.tar.xz | |
Merge branch 'master' of https://github.com/j6t/git-gui
* 'master' of https://github.com/j6t/git-gui:
git-gui: grey out comment lines in commit message
git-gui: wire up "git-gui--askyesno" with Meson
git-gui: massage "git-gui--askyesno" with "generate-script.sh"
git-gui: prefer shell at "/bin/sh" with Meson
git-gui: fix use of GIT_CEILING_DIRECTORIES
git-gui: shift tabstops to account for the first column of patch text
Diffstat (limited to 'git-gui/lib/diff.tcl')
| -rw-r--r-- | git-gui/lib/diff.tcl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl index 442737ba4f..8be1a613fb 100644 --- a/git-gui/lib/diff.tcl +++ b/git-gui/lib/diff.tcl @@ -385,6 +385,8 @@ proc read_diff {fd conflict_size cont_info} { # if {[string match {@@@ *} $line]} { set is_3way_diff 1 + apply_tab_size 2 + } elseif {[string match {@@ *} $line]} { apply_tab_size 1 } |