On Aug 4, 2014, at 10:46 AM, Trevor Saunders wrote:
>
>> I had a conflict which is why I noticed this issue in the first place. And I
>> was using git merge :).
>
> I bet git log or blaim would get you better data faster.
So, git merging I would recommend:
[merge]
conflictstyle = dif
On 08/04/14 11:15, Trevor Saunders wrote:
On Sat, Aug 02, 2014 at 03:44:17PM -0700, Andrew Pinski wrote:
On Tue, Jul 29, 2014 at 5:50 AM, wrote:
From: Trevor Saunders
Hi,
this adds a hash_set wrapper around hash_table, and then replaces usage of
pointer_set with it.
bootstrapped +regtest
On Tue, Jul 29, 2014 at 5:50 AM, wrote:
> From: Trevor Saunders
>
> Hi,
>
> this adds a hash_set wrapper around hash_table, and then replaces usage of
> pointer_set with it.
>
> bootstrapped +regtested on x86_64-unknown-linux-gnu, ok?
>
> Trev
>
> ada/
>
> * gcc-interface/trans.c: Use h
On Tue, Jul 29, 2014 at 2:50 PM, wrote:
> From: Trevor Saunders
>
> Hi,
>
> this adds a hash_set wrapper around hash_table, and then replaces usage of
> pointer_set with it.
>
> bootstrapped +regtested on x86_64-unknown-linux-gnu, ok?
Ok.
Thanks,
Richard.
> Trev
>
> ada/
>
> * gcc-in
