mergetools / gvimdiff2on commit Merge branch 'sb/checkout-recurse-submodules' into maint (146b0ab)
   1. "$MERGE_TOOLS_DIR/vimdiff"