[MERGE] log --merge-revisions

[Ian Clatworthy]

John Arbash Meinel wrote:

> Vincent used the option "--include-merges" for this functionality as
> part of "bzr missing" is there a reason to use a different option name?

Not really. I'll change it. I'd also like to add a short option.
I propose -n (and we extend the help message to say
"Show (nested) merge revisions.").

> Also, how does this work with the "default" setting of a format. If I do
> "bzr log --short" does it default to --no-merge-revisions, or will I now
> have to do "bzr log --short --no-merge-revisions" to get the same
> behavior? (Similarly with 'bzr log --long --merge-revisions'.)
> 
> I think having a knob to tweak is nice, I'm just thinking we probably
> want to default to preserving the old behavior unless strongly warranted.

Agreed completely. Existing behaviour is unchanged - this just let's
you force the opposite to the default for a format when you want.

Ian C.