mergetools / gvimdiff2on commit Merge branch 'jk/submodule-init-segv-fix' (d92dbf1)
   1. "$MERGE_TOOLS_DIR/vimdiff"