Submit Hint Search The Forums LinksStatsPollsHeadlinesRSS
14,000 hints and counting!


Click here to return to the 'Use FileMerge to compare folder contents' hint
The following comments are owned by whoever posted them. This site is not responsible for what they say.
Use FileMerge to compare folder contents
Authored by: kaakes on Feb 19, '06 10:42:34AM

I find kdiff3 quite useful to diff and merge files and directories full of files.
Can do 3-way merge as well. Not as flashy as Apple's merge tool, but more functional in my opinion.
http://kdiff3.sourceforge.net/



[ Reply to This | # ]
Use FileMerge to compare folder contents
Authored by: pasamio on Oct 03, '08 05:05:14AM

If you expand the "Compare Files" down it reveals two options: "Ancestor" and "Merge". The ancestor can be used for a three way merge with the two other change sets as the left or right. Merge is the directory for the results to go into.



[ Reply to This | # ]