[MERGE] log --include-merges

[Ian Clatworthy]

John Arbash Meinel wrote:
> Ian Clatworthy wrote:
>> As requested by Jelmer and others, this patch makes
>> --include-merges an alias for --levels 0 in log. The
>> advice about using --levels 0 has been tweaked to refer
>> to --include-merges instead.
> 
>> Ian C.
> 
> 
> By the way, can we get it to not display the message if you supply "-n1"
> (rather than not supplying anything.)

Done.

>          direction = (forward and 'forward') or 'reverse'
> +        if include_merges and levels is None:
> +            levels = 0
> 
> ^- Shouldn't you have a check for "--levels 1 --include-merges" ? (in
> several other places if you supply incompatible args we give warnings.)

Done.

Sent to PQM now.

Ian C.