mergetools / vimdiff3on commit Merge branch 'bw/c-plus-plus' (169c9c0)
   1. "$MERGE_TOOLS_DIR/vimdiff"