This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: GNU C Library master sources branch, master, updated.glibc-2.12-220-geaca756
- From: Petr Baudis <pasky at suse dot cz>
- To: drepper at sourceware dot org
- Cc: libc-alpha at sourceware dot org
- Date: Mon, 22 Nov 2010 17:44:39 +0100
- Subject: Re: GNU C Library master sources branch, master, updated.glibc-2.12-220-geaca756
- References: <20101122161617.24528.qmail@sourceware.org>
Hi!
Thanks for checking this in!
On Mon, Nov 22, 2010 at 04:16:17PM -0000, drepper@sourceware.org wrote:
> Conflicts:
>
> ChangeLog
To avoid ChangeLog conflicts when cherry-picking and merging, you
might find it useful to take a look at the git-merge-changelog merge
driver, as described in
http://sourceware.org/glibc/wiki/GlibcGit#ChangeLog
Petr "Pasky" Baudis