mergetools / gvimdiff3on commit Merge branch 'cp/completion-clone-recurse-submodules' into maint (9a54075)
   1. "$MERGE_TOOLS_DIR/vimdiff"