Merge pull request #10 from whiteinge/mixed-line-endings

Also match Windows line endings

Author: whiteinge

plugin/diffconflicts.vim

@@ -28,14 +28,14 @@ function! s:diffconfl()
     silent execute "read #". l:origBuf
     1delete
     silent execute "file RCONFL"
-    silent execute "g/^=======$/,/^>>>>>>> /d"
+    silent execute "g/^=======\\r\\?$/,/^>>>>>>> /d"
     silent execute "g/^<<<<<<< /d"
     setlocal nomodifiable readonly buftype=nofile bufhidden=delete nobuflisted
     diffthis
 
     " Set up the left-hand side.
     wincmd p
-    silent execute "g/^<<<<<<< /,/^=======$/d"
+    silent execute "g/^<<<<<<< /,/^=======\\r\\?$/d"
     silent execute "g/^>>>>>>> /d"
     diffthis
 endfunction