Skip to main content

You are not logged in. Your edit will be placed in a queue until it is peer reviewed.

We welcome edits that make the post easier to understand and more valuable for readers. Because community members review edits, please try to make the post substantially better than how you found it, for example, by fixing grammar or adding additional resources and hyperlinks.

Required fields*

6
  • <3 vimdiff, I can't figure out how to convince svn to let me use it as a 'merge' tool. Commented Jan 20, 2011 at 18:00
  • gvimdiff also works well for this purpose. Commented Jul 21, 2011 at 11:19
  • 2
    Using the Fugitive plugin makes it even easier! vimcasts.org/episodes/… Commented Jan 20, 2015 at 9:21
  • 1
    If only there was a way to clearly see the diff between local / base and base / remote. Commented Jun 13, 2019 at 16:18
  • mcdiff is another handy CLI merge tool, from mc package (Midnight Commander). Commented Jan 20, 2024 at 22:48