On Tue, Nov 10, 2009 at 9:45 PM, Clint Olsen <clint.olsen at gmail.com> wrote: > Can you suggest a merge tool? I've found merge/diff on Linux & > FreeBSD to be a real mixed bag. KDiff3 is pretty good.