summaryrefslogtreecommitdiff
path: root/GIT-VERSION-GEN
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-03-14 16:01:41 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-03-14 16:01:41 -0700
commit8775279891fd186ce847b7ddb7f0ac2339504300 (patch)
tree521a06bf41d0afc9881553ddaf8ba8e56a7d1254 /GIT-VERSION-GEN
parentMerge branch 'tb/pack-revindex-on-disk' (diff)
parentdoc: describe mergetool configuration in git-mergetool(1) (diff)
downloadtgif-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 'GIT-VERSION-GEN')
0 files changed, 0 insertions, 0 deletions