Merge a branch, ignoring line-endings