I'm keeping my eye on BeyondCompare. But it's not free. It's $80 for the dual platform Linux+Windows and the Pro version which features 3-way merge. It's customization options are great though. There's a trial version over at http://www.scootersoftware.com/ if you want to give it a spin.