mergetools / gvimdiff2on commit Merge branch 'jk/clone-progress-to-stderr' into maint (df1ef91)
   1. "$MERGE_TOOLS_DIR/vimdiff"