File: conflict-markers-diff3.txt

package info (click to toggle)
rust-riffdiff 3.6.0-1
  • links: PTS, VCS
  • area: main
  • in suites:
  • size: 5,784 kB
  • sloc: sh: 206; python: 132; makefile: 11
file content (9 lines) | stat: -rw-r--r-- 240 bytes parent folder | download | duplicates (2) 
1
2
3
4
5
6
7
8
9
 
This is an example of git conflict markers.

<<<<<<< HEAD
This line is changed on the main branch.
||||||| 07ffb9b
This line is from the initial commit on the main branch.
=======
This line is from the branch named "branch".
>>>>>>> branch