mergetools / gvimdiff3on commit push: accept push options (f6a4e61)
   1. "$MERGE_TOOLS_DIR/vimdiff"