Subject: Re: [PATCH v3 5/8] Fold all merge diff variants into an enum

From: Junio C Hamano <[email-masked]>
Date: Mon, 08 Sep 2014 10:36:24 -0700

Thomas Rast <[email-masked]> writes:

> The four ways of displaying merge diffs,
>
> * none: no diff
> * -m: against each parent
> * -c: combined
> * --cc: combined-condensed
>
> were encoded in three flag bits in struct rev_info.  Fold them all
> into a single enum field that captures the variants.

Nice.  It also has a good side effect to spell "condensed" out,
instead of using a shorter "dense", and the end result matches what
the command line option calls it ;-).