diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-03-15 02:01:41 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-15 02:01:41 +0300 |
| commit | 8775279891fd186ce847b7ddb7f0ac2339504300 (patch) | |
| tree | 521a06bf41d0afc9881553ddaf8ba8e56a7d1254 /convert.h | |
| parent | 074d162eff7487c9e296124510147d3856029f5a (diff) | |
| parent | 53204061acbf7a03a6ba050f381e0bf9b01e3a78 (diff) | |
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 'convert.h')
0 files changed, 0 insertions, 0 deletions