riffdiff 3.6.1

A diff filter highlighting changed line parts
1
2
3
4
5
6
7
8
This is an example of git conflict markers.

<<<<<<< HEAD
This line was added on the main branch.
||||||| 07ffb9b
=======
This line was added on the branch named "branch".
>>>>>>> branch