diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-03-14 16:01:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-14 16:01:41 -0700 |
| commit | 8775279891fd186ce847b7ddb7f0ac2339504300 (patch) | |
| tree | 521a06bf41d0afc9881553ddaf8ba8e56a7d1254 /t/t7012-skip-worktree-writing.sh | |
| parent | Merge branch 'tb/pack-revindex-on-disk' (diff) | |
| parent | doc: describe mergetool configuration in git-mergetool(1) (diff) | |
| download | tgif-8775279891fd186ce847b7ddb7f0ac2339504300.tar.xz | |
Merge branch 'jn/mergetool-hideresolved-is-optional'
Disable the recent mergetool's hideresolved feature by default for
backward compatibility and safety.
* jn/mergetool-hideresolved-is-optional:
doc: describe mergetool configuration in git-mergetool(1)
mergetool: do not enable hideResolved by default
Diffstat (limited to 't/t7012-skip-worktree-writing.sh')
0 files changed, 0 insertions, 0 deletions