mergetools / vimdiff3on commit Merge branch 'bw/grep-recurse-submodules' (55d128a)
   1. "$MERGE_TOOLS_DIR/vimdiff"