mergetools / gvimdiff3on commit Merge branch 'ab/grep-preparatory-cleanup' into sb/submodule-blanket-recursive (234b10d)
   1. "$MERGE_TOOLS_DIR/vimdiff"