Use opendiff as merge tool