From d40bde53a33ef1a081296436a9c1c136d49ee7ed Mon Sep 17 00:00:00 2001 From: Ilya Grigoriev Date: Sun, 20 Aug 2023 22:08:53 -0700 Subject: [PATCH] config.md: update Vim instructions to mention `vimtabdiff` `vimtabdiff` has a few potential advantages: - It can be much more convenient for diffs with few files - It can be easier to set up for some people (it is a Python script rather than a Vim plugin). - The author accepts patches, and I hope to make it support 3-pane diff. The pros and cons are also described in the linked Gist. --- docs/config.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/config.md b/docs/config.md index d95118cb3..7bf189afe 100644 --- a/docs/config.md +++ b/docs/config.md @@ -416,11 +416,12 @@ this file will be ignored. To suppress the creation of this file, set Using `ui.diff-editor = "vimdiff"` is possible but not recommended. For a better experience, you can follow these [instructions] to configure -the [`DirDiff` Vim plugin]. +the [`DirDiff` Vim plugin] and/or the [`vimtabdiff` Python script]. [instructions]: https://gist.github.com/ilyagr/5d6339fb7dac5e7ab06fe1561ec62d45 [`DirDiff` Vim plugin]: https://github.com/will133/vim-dirdiff +[`vimtabdiff` Python script]: https://github.com/balki/vimtabdiff ## 3-way merge tools for conflict resolution