mergetools / gvimdiff2on commit Merge branch 'sg/overlong-progress-fix' (425e51e)
   1. "$MERGE_TOOLS_DIR/vimdiff"