mergetools / gvimdiff3on commit Merge branch 'mk/submodule-gitdir-path' into maint (1bf986b)
   1. "$MERGE_TOOLS_DIR/vimdiff"