File: git-diff-conflict.diff

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 (12 lines) | stat: -rw-r--r-- 280 bytes parent folder | download 
1
2
3
4
5
6
7
8
9
10
11
12
 
diff --cc file.txt
index ab87638,3f14491..0000000
--- file.txt
+++ file.txt
@@@ -1,3 -1,3 +1,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