Re: Having a custom merge process (was: EWW bugs should be fixed on emacs-25 branch)

[Eli Zaretskii]

> From: Richard Stallman <address@hidden>
> CC: address@hidden, address@hidden, address@hidden,
>       address@hidden
> Date: Sat, 26 Dec 2015 21:52:30 -0500
> 
>   > Newcomers are told to use gitmerge.el, so how that could be a problem?
> 
> There is no file gitmerge.el in the Emacs release.  Where is gitmerge.el
> distributed?

It's part of Emacs, and lives in admin/.

You don't see it in a released Emacs because we didn't yet release
Emacs since we switched to Git; gitmerge.el was written as part of
that switch.  The next Emacs release will include it.