File: git-diff-conflict-diff3-edit-remove.riff-output

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 (16 lines) | stat: -rw-r--r-- 350 bytes parent folder | download | duplicates (2) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
 
diff --cc lines.txt
index 97515f1,f42366c..0000000
--- lines.txt
+++ lines.txt
@@@ -1,3 -1,6 +1,11 @@@
  First line
++<<<<<<< HEAD
++||||||| 3b5ce9b
++Caesar
++=======
+ Adam
+ Bertil
+ Caesar
++>>>>>>> branch
  Last line