alternatives to mergemaster

[Michael P. Soulier]

The downside of mergemaster is that it is only a 2-way merge, where a
3-way would know better than you prompt you for changes that you
didn't make. This makes mergemaster far more tedious than it has to
be. Has anyone considered a good 3-way merge tool?

I'm using Git for development, and it's also tremendously good at
merging. This makes me kick around ideas for how to integrate it into
a freebsd upgrade.

Thanks,
Mike
-- 
Michael P. Soulier <msoulier at digitaltorque.ca>
"Any intelligent fool can make things bigger and more complex... It takes a
touch of genius - and a lot of courage to move in the opposite direction."
--Albert Einstein