Visual DiffMerge with Patch File Support?
-
Can anyone recommend a visual Diff/Merge tool which supports unified format (GNU Diff -u option) patch files? Windows platform essential, bonus points for multi-platform. I have in mind that it should have a menu option to produce a patch file for the files currently open in the compare display. A bonus would be the ability to load a patch file and visually display the changes it would make, allowing you to selectively merge them. Failing that, a Diff/Merge tool that supports generic shelling to external tools with token pasting for the left and right paths. Does not have to be freeware - I will pay if necessary!
-
Can anyone recommend a visual Diff/Merge tool which supports unified format (GNU Diff -u option) patch files? Windows platform essential, bonus points for multi-platform. I have in mind that it should have a menu option to produce a patch file for the files currently open in the compare display. A bonus would be the ability to load a patch file and visually display the changes it would make, allowing you to selectively merge them. Failing that, a Diff/Merge tool that supports generic shelling to external tools with token pasting for the left and right paths. Does not have to be freeware - I will pay if necessary!
Will Java tools do the work?? There are some java based diff tools i'm aware of... Just can't remember the names... one is also integrated inside Netbeans.
-
Can anyone recommend a visual Diff/Merge tool which supports unified format (GNU Diff -u option) patch files? Windows platform essential, bonus points for multi-platform. I have in mind that it should have a menu option to produce a patch file for the files currently open in the compare display. A bonus would be the ability to load a patch file and visually display the changes it would make, allowing you to selectively merge them. Failing that, a Diff/Merge tool that supports generic shelling to external tools with token pasting for the left and right paths. Does not have to be freeware - I will pay if necessary!
I am using Beyond Compare are work, not free, but very nice: Beyond Compare[^] Assuming you are looking for a free tool I have been evaluating these two: Meld Merge[^] http://winmerge.org/[^] Both can be used with Git: Look at the Meld Docs How to use WinMerge with Git (StackOverflow)[^]
Tanks for your support Pat O
-
I am using Beyond Compare are work, not free, but very nice: Beyond Compare[^] Assuming you are looking for a free tool I have been evaluating these two: Meld Merge[^] http://winmerge.org/[^] Both can be used with Git: Look at the Meld Docs How to use WinMerge with Git (StackOverflow)[^]
Tanks for your support Pat O
Thanks Pat! Since posting this question I found Winmerge which does what I need (and has very nice explorer integration). But thanks for the Beyond Compare tip as having directory sync integrated too is attractive. My objection to paid-for software is not actually paying, but the restrictions on use imposed by the licensing.