Re: [PATCH v4] libc: Extend __libc_freeres framework (Bug 23329).

[Florian Weimer <fweimer at redhat dot com>]

On 06/28/2018 03:35 PM, Carlos O'Donell wrote:
> This is the only commit I have on top of master.
>
> Where are the conflicts?

git am cannot construct a common ancestor because it doesn't have a copy 
of the original file:

diff --git a/ChangeLog b/ChangeLog
index 1f35f29d77..5f34833c2c 100644

Locally, I do not have a blob starting with 1f35f29d77, with master at 
commit 0b11b6491cc01b5ce5fea1302f8591f25e8c4d80.

Thanks,
Florian