Make line-endings uniform. Pick the one which changes the least number of lines...