Skip to content

Commit 2ebf4fc

Browse files
authored
Merge pull request git#585 from git/vimdiff-article
rn-88: include article about vimdiff mergetool driver change
2 parents aa790cb + 361f7a9 commit 2ebf4fc

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

‎rev_news/drafts/edition-88.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,8 @@ __Various__
166166
by Mike Vizard on DevOps\.com.
167167

168168
__Light reading__
169+
+[Improvements in git 2.37 when resolving conflicts with vimdiff](https://u92.eu/blog/git-vimdiff/)
170+
describes a change in Git 2.37 w.r.t vimdiff mergetool drivers.
169171
+[Better File Comparison with Kaleidoscope](https://www.git-tower.com/blog/kaleidoscope/) by Bruno Brito on Tower’s blog.
170172
+[Working with Feature Branches](https://www.git-tower.com/blog/working-with-feature-branches/) by Bruno Brito on Tower’s blog.
171173
+[Coming Up on Tower's Roadmap](https://www.git-tower.com/blog/coming-up-on-the-roadmap-2022/) by Bruno Brito on Tower’s blog.

0 commit comments

Comments
(0)