mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-12 07:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

config.md: update Vim instructions to mention vimtabdiff

Browse source 
`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.
This commit is contained in:
Ilya Grigoriev 2023-08-20 22:08:53 -07:00
parent 49fb26fdae
commit d40bde53a3
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/config.md
View file

@ -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