mergetools / vimdiff2on commit Merge branch 'sb/config-write-fix' (2a2c18f)
   1. "$MERGE_TOOLS_DIR/vimdiff"