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

[John Wiegley]

>>>>> Eli Zaretskii <address@hidden> writes:

>> What it does track are "patch ids", that is, the SHA of the diff represented
>> by a given commit against its parent:
>> 
>> https://www.kernel.org/pub/software/scm/git/docs/git-patch-id.html> 
>> This allows the merging algorithm to know whether it's attempting to bring in
>> a change that has already been seen on the target branch.

> Since what Git version?

That's a command since 2.6, but the concept has been there for years.  I've
run into this while doing heavy-duty, daily merge work on other projects.

> How does "git cherry" enter the picture? We were talking about cherry-pick
> and merge commands.

Oops, misread when I injected that link. But it should still be relevant for
merging.

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.

-- 
John Wiegley                  GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com                          60E1 46C4 BD1A 7AC1 4BA2