This is the mail archive of the
elfutils-devel@sourceware.org
mailing list for the elfutils project.
Re: Add support for call_site and entry_value to dwarf.h and readelf
- From: Mark Wielaard <mjw at redhat dot com>
- To: elfutils-devel at lists dot fedorahosted dot org
- Date: Wed, 23 Mar 2011 15:28:21 +0100
- Subject: Re: Add support for call_site and entry_value to dwarf.h and readelf
On Wed, 2011-03-23 at 07:00 -0700, Roland McGrath wrote:
> > (*) Is there any good way to get a git merge across ChangeLogs to
> > "autoresolve"? Often the various ChangeLog files are the only merge
> > conflicts I need to resolve (although in this case there were some
> > Makefile.am and of course the readelf/dwarfstrings split to take care
> > of).
>
> There is a merge helper that I use for that and it works very well. I will
> have to go look at another machine to find the config details. But you can
> poke around for "git-merge-changelog" and find it on the web.
Found instructions on how to install it
http://gcc.gnu.org/wiki/GitMirror#git-merge-changelog
Awesome!