What is the best merge tool for Visual Studio .rc files? It would be nice, if the merge tool could display the resource (e.g. dialog box).
Asked
Active
Viewed 4,922 times
4
-
@Hans Passant: In this case [WinMerge](http://winmerge.org/) could be better. – Naszta Apr 04 '11 at 14:57
-
What is the merge tool of Team Foundation Server? Is it capable to visual merge resource files? – Naszta Apr 04 '11 at 15:40
2 Answers
5
Given that rc files are text files, I'd go with WinMerge if you're on a budget, and if money's no object I'd go with Araxis Merge. The main advantage of Araxis over WinMerge is the 3-way merge.
Both are fully supported as merge tools for git.
See here for Araxis + git and here for WinMerge + git.
Sadly, I know of no diff tools that would show you the resulting dialogs / controls represented by the merged file at merge time.
2
These two SuperUser Questions seem to be worth a look
What is a good text comparison tool for Windows?
What program to use to compare big files under Windows?
It seems the list they come up with is
Community
- 1
- 1
Conrad Frix
- 51,984
- 12
- 96
- 155