git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 09e7220 30bb808)
Merge branch 'sh/mergetools-vimdiff1'
authorJunio C Hamano <redacted>
Fri, 26 Feb 2021 00:43:32 +0000 (16:43 -0800)
committerJunio C Hamano <redacted>
Fri, 26 Feb 2021 00:43:32 +0000 (16:43 -0800)
Mergetools update.

* sh/mergetools-vimdiff1:
  mergetools/vimdiff: add vimdiff1 merge tool variant


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