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