]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit123dfdff0d6e886ce5536d39dd77dcd46db8d4c0
treef4773e28ec45311814abcd32f94ab581a2a24895tree | snapshot
parentc237c3fd5f038802f3d390c2e1aba9d0fd2f1fd9commit | diff
parent980145f7470e20826ca22d7343494712eda9c81dcommit | diff
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
Documentation/Makefile diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.