mergetools / vimdiff2on commit Sync with 2.4.8 (e88b858)
   1. "$MERGE_TOOLS_DIR/vimdiff"