| commit | 123dfdff0d6e886ce5536d39dd77dcd46db8d4c0 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 11 May 2022 00:41:11 +0000 (10 17:41 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 11 May 2022 00:41:11 +0000 (10 17:41 -0700) | ||
| tree | f4773e28ec45311814abcd32f94ab581a2a24895 | treesnapshot (tar.gz zip) |
| parent | c237c3fd5f038802f3d390c2e1aba9d0fd2f1fd9 | commitdiff |
| parent | 980145f7470e20826ca22d7343494712eda9c81d | commitdiff |
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
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 | blobhistory |