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

[Andreas Schwab]

On Jun 28 2018, Carlos O'Donell <carlos@redhat.com> wrote:

> On 06/28/2018 09:44 AM, Florian Weimer wrote:
>> 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.
>
> I don't have it either, but git format-patch HEAD~2 still generates it.

It's a blob, not a commit.  Try git show 1f35f29d77.

Andreas.

-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."