[PATCH] Fix typeerror when specifying both --rebase and --pull

[Martin Geisler]

Martijn Pieters <mj at zopatista.com> writes:

> # HG changeset patch
> # User Martijn Pieters <mj at zopatista.com>
> # Date 1240997989 -7200
> # Node ID 59f037bc9d4aec082f0ca3da6ebcab6df28595a7
> # Parent  07d5373c7650bd25bb0d678852283550fbee8cab
> Fix typeerror when specifying both --rebase and --pull

Thanks, I've pushed it (twice actually, by mistake...) to crew-stable
(aee8455ee8ec) and crew (cb08c3765a02).

-- 
Martin Geisler

VIFF (Virtual Ideal Functionality Framework) brings easy and efficient
SMPC (Secure Multiparty Computation) to Python. See: http://viff.dk/.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
Url : http://selenic.com/pipermail/mercurial-devel/attachments/20090429/595c156b/attachment.pgp