Re: EWW bugs should be fixed on emacs-25 branch

[Eli Zaretskii]

> From: John Wiegley <address@hidden>
> Cc: address@hidden,  address@hidden,  address@hidden
> Date: Fri, 25 Dec 2015 11:55:43 -0800
> 
> Anyway, I guess what I mean to say is: I think gitmerge.el might be trying to
> do things that Git itself would handle for us.

Maybe so, but better be safe than sorry.  Given the number of times I
saw Git experts here make mistakes about what does and doesn't work, I
will trust gitmerge.el and our experience more than I trust what we
think we know about Git.  Also, gitmerge.el should DTRT no matter
which version of Git is installed (I hear that some systems still have
Git 1.7.1 or something like that).