Diffconflicts - A Better Vimdiff Git Mergetool

2019 4:29
Synopsis
Resolve conflict markers as a simple two-way diff. https://github.com/whiteinge/diffconflicts.

You Might Also Like

Using Vimdiff as a Git Mergetool - Vim Tips & Tricks 6:17
Using Vimdiff As A Git Mergetool - Vim Tips & Tricks
2026
git mergetool explained 7:05
Git Mergetool Explained
2016
git merge conflicts using vimdiff 13:39
Git Merge Conflicts Using Vimdiff
2016
Using vimdiff as your git diff tool. 8:55
Using Vimdiff As Your Git Diff Tool.
2013
Vim (43) vimdiff 8:15
Vim (43) Vimdiff
2020
The HIDDEN Git Trick for Resolving Merge Conflicts 8:48
The Hidden Git Trick For Resolving Merge Conflicts
2025
Resolve Git Merge Conflicts with Neovim and Fugitive! 7:14
Resolve Git Merge Conflicts With Neovim And Fugitive!
2024
Git's most powerful but underutilized tool | Merge Conflict ep. 493 55:54
Git's Most Powerful But Underutilized Tool | Merge Conflict ...
2026
Get a Better Git Diff 1:32
Get A Better Git Diff
2023
Resolving Conflicts with Git Mergetool 11:23
Resolving Conflicts With Git Mergetool
2018
Resolve a Git Merge Conflict within Vim | Vim 🔥 Tips and Tricks 5:26
Resolve A Git Merge Conflict Within Vim | Vim 🔥 Tips And ...
2022
Download Options
Choose a download method below. All links open in new tabs.
Service Features Action
SaveFrom
MP4 & MP3 • HD Quality • Browser Extension Available
Download
Security Notice: These are third-party services. We recommend using antivirus software and being cautious of pop-up ads.