From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 May 2022 00:41:11 +0000 (-0700)
Subject: Merge branch 'fr/vimdiff-layout'
X-Git-Tag: v2.37.0-rc0~100
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=123dfdff0d6e886ce5536d39dd77dcd46db8d4c0;p=thirdparty%2Fgit.git

Merge branch 'fr/vimdiff-layout'

Reimplement "vimdiff[123]" mergetool drivers with a more generic
layout mechanism.

* fr/vimdiff-layout:
  mergetools: add description to all diff/merge tools
  vimdiff: add tool documentation
  vimdiff: integrate layout tests in the unit tests framework ('t' folder)
  vimdiff: new implementation with layout support
---

123dfdff0d6e886ce5536d39dd77dcd46db8d4c0