mergetools / vimdiff2on commit Merge branch 'jc/conf-var-doc' (9a9c1f1)
   1. "$MERGE_TOOLS_DIR/vimdiff"