From: Caleb Cushing Date: Wed, 28 Jan 2009 09:53:12 GMT Subject: Re: [PATCH] mergetool merge/skip/abort at prompt Message-ID: <81bfc67a0901280153v33993d73p63687c78df555b48@mail.gmail.com> In-Reply-To: <20090128084756.GA28493@hashpling.org> > With this change, it would seem to be more logical to ask whether the > merge tool is to be run before creating the temporary files, removing > the need for them to be cleaned up if the answer is no. I think that > this would be cleaner overall. I agree, but to be honest, I couldn't get the logic wrapped around my head, so I did it this way. refactoring does seem to be the best idea, but I don't understand enough of it yet to do so. -- Caleb Cushing http://xenoterracide.blogspot.com