mergetools / gvimdiff3on commit Merge branch 'rs/deflate-init-cleanup' into maint (a393c6b)
   1. "$MERGE_TOOLS_DIR/vimdiff"