mergetools / gvimdiffon commit Merge branch 'bw/grep-recurse-submodules' into maint (fd7c38c)
   1. "$MERGE_TOOLS_DIR/vimdiff"