
8 Jan
2015
8 Jan
'15
12:27 a.m.
Thanks Eric!
The conflicts marker is generally only useful for downstream builds that cherry-pick patches. For upstream, we don't need it.
Good to know. I had cherry-picked this out of the maintenance branch I'm actually using onto master, but in future I'll remove those from the commit messages.