mergetools / vimdiff2on commit Merge branch 'ct/autoconf-htmldir' (a2b109f)
   1. "$MERGE_TOOLS_DIR/vimdiff"