diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-11-22 00:14:39 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-22 00:14:39 +0100 |
| commit | d203add8925f4744f6bad6b84870988efe108262 (patch) | |
| tree | 80b6ddacb7b46e4cba649882b2b9c76882826bd0 /archive.h | |
| parent | Merge branch 'ab/config-mak-uname-simplify' (diff) | |
| parent | mergetool: avoid letting `list_tool_variants` break user-defined setups (diff) | |
| download | git-d203add8925f4744f6bad6b84870988efe108262.tar.xz git-d203add8925f4744f6bad6b84870988efe108262.zip | |
Merge branch 'pd/mergetool-nvimdiff'
Fix regression introduced when nvimdiff support in mergetool was added.
* pd/mergetool-nvimdiff:
mergetool: avoid letting `list_tool_variants` break user-defined setups
mergetools/bc: add `bc4` to the alias list for Beyond Compare
Diffstat (limited to 'archive.h')
0 files changed, 0 insertions, 0 deletions