mergetools / gvimdiff2on commit Merge branch 'sg/test-with-stdin' into maint (9304052)
   1. "$MERGE_TOOLS_DIR/vimdiff"