mergetools / vimdiff2on commit push: avoid suggesting "merging" remote changes (fc6c4e9)
   1. "$MERGE_TOOLS_DIR/vimdiff"