git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7942b9 12026f4)
Merge branch 'pd/mergetool-nvimdiff'
authorJunio C Hamano <redacted>
Sat, 21 Nov 2020 23:14:39 +0000 (15:14 -0800)
committerJunio C Hamano <redacted>
Sat, 21 Nov 2020 23:14:39 +0000 (15:14 -0800)
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


Trivial merge
git clone https://git.99rst.org/PROJECT