On Aug 4, 2014, at 10:46 AM, Trevor Saunders <tsaund...@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.
