]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c237c3f 980145f)
Merge branch 'fr/vimdiff-layout'
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 May 2022 00:41:11 +0000 (17:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 May 2022 00:41:11 +0000 (17:41 -0700)
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

1  2 
Documentation/Makefile patch | diff1 | diff2 | blob | history

diff --cc Documentation/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.