On Thu, Jun 12, 2008 at 04:44:03PM -0600, Patrick.Higgins@xxxxxxxx wrote:
> I have found the following to be a way to distinguish the two
> versions based solely on exit status. The broken one exits with 255.
>
> kdiff3 --auto -o /dev/null -- /dev/null /dev/null
>
> I'll work up another patch that uses this. This check adds about
> 0.5s overhead. That seems a little high to me, but given that
> mergetool is interactive, I guess that could be acceptable.
Hmm, do we have a policy about whether or not it is acceptable to
modify .gitconfig behind the user's back? It would be nice if the
check would be done once and then the result gets cached. So if not
in .gitconfig, maybe somewhere else.
- Ted
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
