From: Junio C Hamano <junkio@cox.net>
Date: Wed, 25 Apr 2007 21:18:21 GMT
Subject: Re: [PATCH] Avoid excessive rewrites in merge-recursive
Message-ID: <7vodlcup9e.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20070425200659.GA30061@steel.home>

Alex Riesen <raa.lkml@gmail.com> writes:

> Just as you may have thought merge-recursive cannot get any uglier
> someone comes and does just this: puts another level of indentation.

It really was painful for me the last time I touched the file,
so I share that feeling.  The complexity of this program is
getting out of hand.

Probably we would want a refactoring before doing something like
this.