[Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?

["Martin v. Löwis"]

> It does so at the *tree* level, not at an individual file level.

Thanks - I stand corrected. I was thinking about the file level only (at
which it doesn't do server-side merging - right?).

Regards,
Martin