command line merge tools for windows

Question

Are there command line merge tools for windows? I'm thinking in terms of tools that can be used in conjunction with other tools (e.g. git, unison) to resolve conflicts.

Actually, it doesn't need to strictly be command-line based, as long as it "cooperate" with other command line tools (as I mentioned, git for example), then it's fine.

Answer 1

If you have Git Bash for Windows you probably have Vim and that package includes vimdiff.

If you use MSYS2 or Cygwin you could install mc (Midnight Commander) and it includes handy mcdiff (press F1 for brief help).

Answer 2

Beyond Compare 3 Pro supports command line merges and can handle them both interactively or non-interactively (automerging without a window). It sets the exit code, so it can be integrated with other tools, and it does handle merging files with different encodings.

Answer 3

Araxis Merge is a great diff/merge tool for Windows and Mac, and they also offer a command-line and a .NET API version of their diff/merge engine.

Araxis Merge is the only tool I know of at this time that can compare and merge two files with differing text encoding, e.g. a UTF-8 and an ANSI file side-by-side.

Marc

Answer 4

The problem with graphical merge tools (like WinMerge) is that Git, for instance, waits the exit code (or the validation of the user after the exit of the diff tool), implying that the user first close the external diff tool.

And a pure command-line diff tool is not very practical to use for merge purpose...

Answer 5

I've used KDiff3 and I've heard good things about WinMerge. I'm not sure what command line cooperation you're looking for; I use these tools in conjunction with TortoiseSVN without any problems.