vim-scripts/Conflict2Diff — pull request #1 by quincy (2012-10-25 21:49:46+00:00)
Title: Converted line endings

I converted the line endings to UNIX style since it wasn't playing nicely when used as a Pathogen submodule.