mergetools / gvimdiffon commit Merge branch 'sb/submodule-rm-absorb' into maint (4f7132a)
   1. "$MERGE_TOOLS_DIR/vimdiff"