Skip to content

Support highlighting conflict markers

Compare
Choose a tag to compare
@walles walles released this 24 Jan 20:55
· 291 commits to master since this release

Conflict markers can be added to files by git merge for example.

Try it:

riff < file-with-conflicts.txt