mergetools / gvimdiff3on commit Merge branch 'bw/submodule-with-bs-path' (bea1579)
   1. "$MERGE_TOOLS_DIR/vimdiff"