riffdiff 3.6.1

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

<<<<<<< HEAD
This line is changed on the main branch.
=======
This line is from the branch named "branch".
>>>>>>> branch