mergetools / gvimdiff2on commit Merge branch 'bw/grep-recurse-submodules' (2502f01)
   1. "$MERGE_TOOLS_DIR/vimdiff"