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 (18 lines) | stat: -rw-r--r-- 329 bytes parent folder | download | duplicates (4) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
 
<<<<<<< found
||||||| expected
#define IDMAP_STATUS_LOOKUPFAIL IDMAP_STATUS_FAIL


/* XXX get (include) from bits/utmp.h */
#define IDMAP_NAMESZ  128

=======
#define IDMAP_STATUS_LOOKUPFAIL IDMAP_STATUS_FAIL


#define IDMAP_MAXMSGSZ   256

/* XXX get (include) from bits/utmp.h */
#define IDMAP_NAMESZ  128

>>>>>>> replacement