merge: fix test failures with new merge code on OS X The case collision checker was missing a op entry for 'k'eep.

obsolete: fix one-element tuple in module docstring

obsolete: let N denote number of obsoleted changestes in a marker The number of obsoleted changesets is referred to as N later in the docstring.

obsolete: fix language and grammar in module docstring

churn: compute padding with unicode strings Most UTF-8 aware terminals convert multibyte sequences into a single displayed characters. Because the first column is padded by counting bytes, the second column is not perfectly aligned in the presence of non ASCII characters.

Added signature for changeset 564f55b25122

Added tag 3.0-rc for changeset 564f55b25122

merge default into stable for 3.0 code freeze

bundle2: allow extensions to extend the getbundle request We want extensions to be able to request extra parts.

bundle2: add a way to add parts during a `getbundle` request We add a hook function to let extensions add parts to the bundle.