From: Sebastian Schuberth Date: Thu, 18 Aug 2011 07:49:33 GMT Subject: Re: [PATCH 1/4] difftool--helper: Make style consistent with git Message-ID: In-Reply-To: <1313652227-48545-2-git-send-email-davvid@gmail.com> On Thu, Aug 18, 2011 at 09:23, David Aguilar wrote: > Use the predominant conditional style where "then" appears > alone on the line after the test expression. I support your effort to unify the style, but for my personal taste it has gone the wrong way :-) Even if "then" on its own line was the predominant style in the merge scripts, I would have voted for putting all "then" in the same line as "if" as I find this easier to read and comprehend. But then again it's obvious that such a change would polarize ;-) -- Sebastian Schuberth