Written by Jakub2026-07-27
Vim in cloud, part 4
Again, this is not about Vim alone, but rather as extension to Git. If you are dealing with conflicts in a repository, tell Git to use vimdiff (a version of Vim pre-configured for differences already mention in “Vim in cloud, part 2“) as your merge tool. This provides a 3-way merge view: How to set
Archives
Calendar
| M | T | W | T | F | S | S |
|---|---|---|---|---|---|---|
| 1 | 2 | 3 | 4 | 5 | ||
| 6 | 7 | 8 | 9 | 10 | 11 | 12 |
| 13 | 14 | 15 | 16 | 17 | 18 | 19 |
| 20 | 21 | 22 | 23 | 24 | 25 | 26 |
| 27 | 28 | 29 | 30 | 31 | ||