fix diffconflicts with CRLF EOL files

diffconflicts does not work with CRLF end of line
![2014-10-15-223218_1913x243_scrot](https://cloud.githubusercontent.com/assets/8235752/4653043/6cd3f95e-54aa-11e4-9e1d-4a6f24b661c1.png)