mergetools / gvimdiff3on commit Merge branch 'sb/clone-t57-t56' into maint (5859f04)
   1. "$MERGE_TOOLS_DIR/vimdiff"