mergetools / gvimdiff3on commit Merge branch 'bw/submodule-branch-dot-doc' (7425fe1)
   1. "$MERGE_TOOLS_DIR/vimdiff"