File: conflict-markers.txt

package info (click to toggle)
rust-riffdiff 3.6.0-2
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 5,784 kB
  • sloc: sh: 206; python: 132; makefile: 11
file content (7 lines) | stat: -rw-r--r-- 167 bytes parent folder | download 
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