On 27/08/2012, at 10:46 AM, "Darren Shepherd" <dar...@godaddy.com> wrote:
> My immediate problem is that all of the my patches I have in my queue to > submit just got invalidated because they just all look like conflicts > now. Depending on what ends up being agreed for the style, the merge option -Xignore-space-change might help this specific case. - Brett