This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [PATCH] add hash_set
- From: Mike Stump <mikestump at comcast dot net>
- To: Andrew Pinski <pinskia at gmail dot com>
- Cc: GCC Patches <gcc-patches at gcc dot gnu dot org>, Trevor Saunders <tsaunders at mozilla dot com>
- Date: Mon, 4 Aug 2014 11:10:45 -0700
- Subject: Re: [PATCH] add hash_set
- Authentication-results: sourceware.org; auth=none
- References: <1406638216-31397-1-git-send-email-tsaunders at mozilla dot com> <CA+=Sn1n=AMt3RjgdD8AkVwgrVBoQ87ewS-GDHZ+v873JdSNERw at mail dot gmail dot com> <20140804171545 dot GA31005 at tsaunders-iceball dot corp dot tor1 dot mozilla dot com> <7A60DF99-A30B-48D1-AB9D-42138D597EC3 at gmail dot com> <20140804174612 dot GB31005 at tsaunders-iceball dot corp dot tor1 dot mozilla dot com>
On Aug 4, 2014, at 10:46 AM, Trevor Saunders <tsaunders@mozilla.com> 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 = diff3
[rerere]
enabled = 1
if you don’t already. I think diff3 should be the default it is so handy.