mergetools / vimdiff2on commit test: trivial cleanups (15c7348)
   1. "$MERGE_TOOLS_DIR/vimdiff"