Re: [PATCH] mergetool merge/skip/abort

[Theodore Tso <tytso@mit.edu>]

On Fri, Jan 23, 2009 at 09:26:32AM -0800, Junio C Hamano wrote:
> Caleb Cushing <xenoterracide@gmail.com> writes:
> 
> > so does my patch satisfy now? what's it take to get it included in the
> > next version of git?
> 
> I do not use mergetool myself so I generally do not pay attention to
> patches on this tool, but I would want to pick up ones that people
> involved in mergetool discussion can agree to be good patches.
> 
> There are a few mergetool updates in flight from various authors.  How
> does your submission compare with others' in both form/presentation and
> clarity of logic (remember, I am not keeping track)?

I was the original author of mergetool, and for a while I was the
person that was reviewing and managing the mergetool patches for
Junio.  Unfortunately, in the last couple of months I just haven't had
the time keep up with the various mergetool proposed patch updates.

So maybe it's time for me to hand it off to someone who has the time
and interest in continuing to hack mergetool, and has the necessary
"good taste" and such that Junio would be willing to trust that person
to be the git mergetool patch wrangler?

							- Ted