mergetools / vimdiff2on commit Sync with v2.2.1 (3f15098)
   1. "$MERGE_TOOLS_DIR/vimdiff"