From: Junio C Hamano Date: Mon, 08 Sep 2014 17:36:24 GMT Subject: Re: [PATCH v3 5/8] Fold all merge diff variants into an enum Message-ID: In-Reply-To: Thomas Rast 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 ;-).