[PATCH 2 of 2 v3] merge: respect bookmarks during merge

[Matt Mackall]

On Sun, 2012-05-13 at 11:57 +0200, David Soria Parra wrote:
> # HG changeset patch
> # User David Soria Parra <dsp at php.net>
> # Date 1336902942 -7200
> # Node ID cd8cabd6eff15053d03fb32251ce3479157fbaa5
> # Parent  f92201802b3c44c4ab37bd5ecbe6e35749fe94be
> merge: respect bookmarks during merge

These are queued, thanks.

-- 
Mathematics is the supreme nostalgia of our time.