File: merge

package info (click to toggle)
wiggle 1.3-1
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid, trixie
  • size: 15,036 kB
  • sloc: ansic: 13,649; sh: 1,180; makefile: 194
file content (15 lines) | stat: -rw-r--r-- 128 bytes parent folder | download | duplicates (8) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
 
This
is
the
current
version
of
the
<<<<<<< found
file.
||||||| expected
file
=======
file that has changed
>>>>>>> replacement