projects
/
debian
/
cpmtools
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix up control and rules file issues identified by lintian
[debian/cpmtools]
/
diskdefs
diff --git
a/diskdefs
b/diskdefs
index 7d8a4442a80aa6e063e78bbec89ea94efb4ec2fb..020dfbf9f3eb494b36aca22fb7a0ee22168956a4 100644
(file)
--- a/
diskdefs
+++ b/
diskdefs
@@
-231,6
+231,16
@@
diskdef p112
tracks 160
sectrk 18
blocksize 2048
tracks 160
sectrk 18
blocksize 2048
+<<<<<<< HEAD:diskdefs
+ maxdir 128
+ skew 1
+ boottrk 1
+ os 3
+end
+
+
+diskdef p112a
+=======
maxdir 256
skew 1
boottrk 2
maxdir 256
skew 1
boottrk 2
@@
-238,15
+248,22
@@
diskdef p112
end
diskdef p112-old
end
diskdef p112-old
+>>>>>>> 224b4e6d27a3af235500d9d8028ddbd3a60af7ed:diskdefs
seclen 512
tracks 160
sectrk 18
blocksize 2048
seclen 512
tracks 160
sectrk 18
blocksize 2048
+<<<<<<< HEAD:diskdefs
+ maxdir 256
+=======
maxdir 128
maxdir 128
+>>>>>>> 224b4e6d27a3af235500d9d8028ddbd3a60af7ed:diskdefs
skew 1
boottrk 1
os 3
end
skew 1
boottrk 1
os 3
end
+<<<<<<< HEAD:diskdefs
+=======
diskdef kpii
seclen 512
diskdef kpii
seclen 512
@@
-258,3
+275,4
@@
diskdef kpii
boottrk 1
os 2.2
end
boottrk 1
os 2.2
end
+>>>>>>> 224b4e6d27a3af235500d9d8028ddbd3a60af7ed:diskdefs