DiffMerge is a free tool that visually compares and merges files and folders, showing line and character differences and supporting three-way merges of edits. What is DiffMerge? DiffMerge is a free ...
DiffMerge was getting killed on my mac. It turns out a hacky fix (martinsson@01dc6ea) will to the job. I'd be happy if someone had a better grasp of why this is so. But if we don't understand perhaps ...