mergetools / gvimdiff3on commit apply: reject a hunk that does not do anything (ad6e8ed)
   1. "$MERGE_TOOLS_DIR/vimdiff"