mergetools / gvimdiffon commit apply: check git diffs for mutually exclusive header lines (d70e9c5)
   1. "$MERGE_TOOLS_DIR/vimdiff"