diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-22 11:26:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-22 11:26:56 -0700 |
| commit | 21247455f328fcf26fc4f78134bcc6f8a676fa8a (patch) | |
| tree | e2ffee5d17870e5cfd69fb0e915a3568c42dfd33 /git-mergetool--lib.sh | |
| parent | Merge branch 'ap/combine-diff-ignore-whitespace' into maint (diff) | |
| parent | test: resurrect q_to_tab (diff) | |
| download | tgif-21247455f328fcf26fc4f78134bcc6f8a676fa8a.tar.xz | |
Merge branch 'jc/apply-ws-fix-tab-in-indent' into maint
* jc/apply-ws-fix-tab-in-indent:
test: resurrect q_to_tab
apply --whitespace=fix: avoid running over the postimage buffer
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions