| .. |
|
acorn
|
file 3.38
|
2002-05-18 06:45:50 +00:00 |
|
adi
|
file 3.36
|
2001-07-22 22:31:55 +00:00 |
|
adventure
|
file 3.38
|
2002-05-18 06:45:50 +00:00 |
|
allegro
|
new file 3.31
|
2000-05-14 22:44:21 +00:00 |
|
alliant
|
|
|
|
alpha
|
resolve conflicts
|
2000-09-22 16:34:59 +00:00 |
|
amanda
|
|
|
|
amigaos
|
conflict therapy
|
2002-05-18 07:00:44 +00:00 |
|
animation
|
conflict therapy
|
2002-05-18 07:00:44 +00:00 |
|
apl
|
|
|
|
apple
|
resolve conflicts
|
2001-07-22 22:53:00 +00:00 |
|
applix
|
|
|
|
archive
|
end this destructive conflict
|
2002-07-09 14:59:52 +00:00 |
|
asterix
|
|
|
|
att3b
|
|
|
|
audio
|
Yamaha TX Wave
|
2002-07-10 09:02:22 +00:00 |
|
blender
|
file 3.32
|
2000-09-22 16:01:07 +00:00 |
|
blit
|
|
|
|
bsdi
|
|
|
|
c-lang
|
|
|
|
cddb
|
file 3.39
|
2002-07-09 14:47:21 +00:00 |
|
chi
|
|
|
|
cisco
|
|
|
|
citrus
|
oops, this was actually a new file, not an old file that is dead
|
2001-07-22 23:34:22 +00:00 |
|
claris
|
new file 3.31
|
2000-05-14 22:44:21 +00:00 |
|
clipper
|
|
|
|
commands
|
conflict therapy
|
2002-05-18 07:00:44 +00:00 |
|
compress
|
conflict therapy
|
2002-05-18 07:00:44 +00:00 |
|
console
|
new file 3.31
|
2000-05-14 22:44:21 +00:00 |
|
convex
|
|
|
|
ctags
|
file 3.33
|
2000-11-23 23:07:30 +00:00 |
|
cvs
|
file 3.38
|
2002-05-18 06:45:50 +00:00 |
|
database
|
end this destructive conflict
|
2002-07-09 14:59:52 +00:00 |
|
diamond
|
|
|
|
diff
|
Resolve corn flakes.
|
1999-11-01 17:39:26 +00:00 |
|
digital
|
|
|
|
dolby
|
file 3.38
|
2002-05-18 06:45:50 +00:00 |
|
dump
|
|
|
|
dyadic
|
file 3.34
|
2001-03-17 11:06:52 +00:00 |
|
editors
|
file 3.38
|
2002-05-18 06:45:50 +00:00 |
|
elf
|
conflict therapy
|
2002-05-18 07:00:44 +00:00 |
|
encore
|
|
|
|
epoc
|
new file 3.31
|
2000-05-14 22:44:21 +00:00 |
|
filesystems
|
end this destructive conflict
|
2002-07-09 14:59:52 +00:00 |
|
flash
|
|
|
|
fonts
|
Resolve conflicts
|
2000-05-14 22:53:37 +00:00 |
|
frame
|
|
|
|
freebsd
|
resolve conflicts
|
2001-07-22 22:53:00 +00:00 |
|
fsav
|
new file 3.31
|
2000-05-14 22:44:21 +00:00 |
|
gimp
|
new version of file(1)
|
1999-11-01 17:30:12 +00:00 |
|
gnu
|
new file 3.31
|
2000-05-14 22:44:21 +00:00 |
|
grace
|
new version of file(1)
|
1999-11-01 17:30:12 +00:00 |
|
gringotts
|
file 3.38
|
2002-05-18 06:45:50 +00:00 |
|
hitachi-sh
|
invert the meanings of the F_LSYMS field.
|
2001-08-14 21:26:54 +00:00 |
|
hp
|
resolve conflicts
|
2001-03-17 11:21:51 +00:00 |
|
human68k
|
file(1) magic for Human68k (X680x0 DOS) binary formats
|
2002-05-21 07:59:16 +00:00 |
|
ibm370
|
|
|
|
ibm6000
|
|
|
|
iff
|
|
|
|
images
|
conflict therapy
|
2002-05-18 07:00:44 +00:00 |
|
intel
|
|
|
|
interleaf
|
|
|
|
island
|
|
|
|
ispell
|
Resolve conflicts
|
2000-05-14 22:53:37 +00:00 |
|
java
|
|
|
|
jpeg
|
resolve conflicts
|
2001-07-22 22:53:00 +00:00 |
|
karma
|
Resolve corn flakes.
|
1999-11-01 17:39:26 +00:00 |
|
lecter
|
|
|
|
lex
|
|
|
|
lif
|
|
|
|
linux
|
end this destructive conflict
|
2002-07-09 14:59:52 +00:00 |
|
lisp
|
conflict therapy
|
2002-05-18 07:00:44 +00:00 |
|
mach
|
new version of file(1)
|
1999-11-01 17:30:12 +00:00 |
|
macintosh
|
add additional StuffIt format.
|
2002-07-15 06:07:16 +00:00 |
|
magic
|
resolve conflicts
|
2001-07-22 22:53:00 +00:00 |
|
mail.news
|
resolve conflicts
|
2001-07-22 22:53:00 +00:00 |
|
maple
|
new file 3.31
|
2000-05-14 22:44:21 +00:00 |
|
mathematica
|
new file 3.31
|
2000-05-14 22:44:21 +00:00 |
|
mcrypt
|
file 3.38
|
2002-05-18 06:45:50 +00:00 |
|
mime
|
|
|
|
mips
|
mips-magic is back
|
2001-07-22 23:29:55 +00:00 |
|
mirage
|
|
|
|
mkid
|
|
|
|
mlssa
|
Recognise MLSSA datafiles
|
2001-09-20 03:05:54 +00:00 |
|
mmdf
|
|
|
|
modem
|
|
|
|
motorola
|
resolve conflicts
|
2001-07-22 22:53:00 +00:00 |
|
msdos
|
resolve conflicts
|
2001-07-22 22:53:00 +00:00 |
|
msvc
|
file 3.32
|
2000-09-22 16:01:07 +00:00 |
|
natinst
|
file 3.37
|
2001-09-09 10:38:55 +00:00 |
|
ncr
|
|
|
|
netbsd
|
alpha core has signal number in little endian, no in big endian.
|
2001-05-16 00:52:48 +00:00 |
|
netscape
|
new file 3.31
|
2000-05-14 22:44:21 +00:00 |
|
news
|
|
|
|
nitpicker
|
file 3.38
|
2002-05-18 06:45:50 +00:00 |
|
octave
|
|
|
|
olf
|
|
|
|
os2
|
new version of file(1)
|
1999-11-01 17:30:12 +00:00 |
|
os9
|
resolve conflicts
|
2001-03-17 11:21:51 +00:00 |
|
osf1
|
|
|
|
palm
|
new version of file(1)
|
1999-11-01 17:30:12 +00:00 |
|
parix
|
file 3.34
|
2001-03-17 11:06:52 +00:00 |
|
pbm
|
|
|
|
pdf
|
|
|
|
pdp
|
|
|
|
perl
|
file 3.38
|
2002-05-18 06:45:50 +00:00 |
|
pgp
|
|
|
|
pkgadd
|
|
|
|
plus5
|
|
|
|
printer
|
conflict therapy
|
2002-05-18 07:00:44 +00:00 |
|
project
|
new file 3.31
|
2000-05-14 22:44:21 +00:00 |
|
psdbms
|
|
|
|
pulsar
|
file 3.39
|
2002-07-09 14:47:21 +00:00 |
|
pyramid
|
|
|
|
python
|
file 3.32
|
2000-09-22 16:01:07 +00:00 |
|
riff
|
file 3.36
|
2001-07-22 22:31:55 +00:00 |
|
rpm
|
|
|
|
rtf
|
|
|
|
sc
|
|
|
|
sccs
|
|
|
|
sendmail
|
conflict therapy
|
2002-05-18 07:00:44 +00:00 |
|
sequent
|
|
|
|
sgml
|
Resolve conflicts
|
2000-05-14 22:53:37 +00:00 |
|
sharc
|
file 3.36
|
2001-07-22 22:31:55 +00:00 |
|
sketch
|
file 3.36
|
2001-07-22 22:31:55 +00:00 |
|
smalltalk
|
file 3.37
|
2001-09-09 10:38:55 +00:00 |
|
sniffer
|
resolve conflicts
|
2001-09-09 10:46:36 +00:00 |
|
softquad
|
resolve conflicts
|
2001-07-22 22:53:00 +00:00 |
|
spectrum
|
new version of file(1)
|
1999-11-01 17:30:12 +00:00 |
|
sun
|
|
|
|
sysex
|
file 3.36
|
2001-07-22 22:31:55 +00:00 |
|
teapot
|
|
|
|
terminfo
|
|
|
|
tex
|
conflict therapy
|
2002-05-18 07:00:44 +00:00 |
|
tgif
|
file 3.38
|
2002-05-18 06:45:50 +00:00 |
|
ti-8x
|
|
|
|
timezone
|
|
|
|
troff
|
make file(1) recognize our manpages in src/gnu/libexec/uucp/*
|
2001-06-24 01:40:30 +00:00 |
|
tuxedo
|
file 3.34
|
2001-03-17 11:06:52 +00:00 |
|
typeset
|
|
|
|
unknown
|
|
|
|
uuencode
|
|
|
|
varied.out
|
conflict therapy
|
2002-05-18 07:00:44 +00:00 |
|
vax
|
|
|
|
vicar
|
|
|
|
visx
|
|
|
|
vms
|
|
|
|
vmware
|
file 3.32
|
2000-09-22 16:01:07 +00:00 |
|
vorbis
|
file 3.38
|
2002-05-18 06:45:50 +00:00 |
|
vxl
|
file 3.38
|
2002-05-18 06:45:50 +00:00 |
|
wordperfect
|
|
|
|
xdelta
|
new file 3.31
|
2000-05-14 22:44:21 +00:00 |
|
xenix
|
|
|
|
zilog
|
|
|
|
zyxel
|
|
|
