GitHub repository: vim-scripts/Conflict2Diff
Primary language: VimL
Description: Turns a CVS conflict file into a threeway diff