Understanding Vim Diff
Exploring Vim Diff reveals several interesting facts. Resolve conflict markers as a simple two-way
Detailed Analysis of Vim Diff
I often review Pull requests from the browser as it just makes it so easy to see the Vim --- -d, :diffo, :difft, :diffs, [c, ]c, do, dp, :diffg, :diffpu, diff.txt Merge conflicts are one of my biggest git-hates. I don't like them, and I'm probably not the only one. But what do you know, it turns ...
Stay tuned for more updates related to Vim Diff.