Documentation/git-merge-file: document option "--diff3"