mergetools / gvimdiff3on commit Merge branch 'sb/submodule-deinit-all' into maint (6a024a2)
   1. "$MERGE_TOOLS_DIR/vimdiff"