mergetools / gvimdiff3on commit Merge branch 'sb/submodule-update-dot-branch' (11b5395)
   1. "$MERGE_TOOLS_DIR/vimdiff"