mergetools / vimdiff2on commit Merge branch 'cb/aix' (8ba87ad)
   1. "$MERGE_TOOLS_DIR/vimdiff"