From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 05 Apr 2009 18:41:03 GMT
Subject: Re: [msysGit] [PATCH] mergetool-lib: make (g)vimdiff workable under Windows
Message-ID: <7v63hjt03k.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <200904051232.19939.markus.heidelberg@web.de>

Markus Heidelberg <markus.heidelberg@web.de> writes:

> Junio, is this something for maint? I'm not sure, since this problem
> only occurs on Windows and 'maint' isn't interesting for msysgit ATM.

I am not Dscho (nor J6t) but the last time I asked him about some other
"This makes it work better on Windows" patch, the conclusion was "only
Windows has issues and msysgit does not use 'maint'", which I agreed to be
a sensible answer for an undermanned and still-on bleeding edge project
like msysgit.

I don't mind a trivial backport for only mergetool part to the tip of
'master' (because difftool is not in master) that later makes me deal with
a small merge conflict when the refactoring topic hits master.  Or Dscho
can apply such a backport and carry it as a msysgit-only patch until my
'master' is updated with the refactoring topic (at which point the
tentative patch needs to be dropped).  Either would work fine with me.