xdiff-merge: optionally show conflicts in "diff3 -m" style