mergetools / vimdiff3on commit Merge branch 'mb/relnotes-2.1' (764c739)
   1. "$MERGE_TOOLS_DIR/vimdiff"