Back to opendiff as diff/merge tool