DELTA SVNxyxx# $FreeBSD$ .include PROG= diff3 .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include ENDREP DELTA SVN.I..x^Xiog2}m2Gv$& Z~ؖز; $U5)c/ IvUs]XbPjst@G:;9x|S:gG"wQY=C~>"?$"}rM-yucg~3RYuaKe `CntSw-ҩi,7) REJF))7J˛)TL@̛=ZV`bZSܴN⦽W.|4"5ޘGWQ"p{Ћ&{̿Ր1 VWֺp`ݫ$ yQqN8x1R OH{F3|H?~:Mj14N&|+62Z53ө fj釻Ώu /dLyjӔog<aEΕo׫el( $N 9\Ƽev"!n(ݟ99VY4mN VmZ\fܷLj#@jd5)*XRaT$ r wtsU0NX ƉMn2U ^jH=!HtG0ҨT:SU%k}0vG9<,uM~|@=we(3pe,.1; <\ V+818Zn'\q\}PXf!%3^@K\q֛N*O{Y/z4/Y}ԐE"۝]:a(tNCe6kkkr bOieߔ ` b*d%ryM_EoCqoSm&轆%\6\{bQc)ܢfSkoM #s_ vY`S,{q;¸ bT^yUq.l|<$Vi*Gufuʞ{%7f6ש 8wvNё`Ћ*a~@zhn:֡ӣ:Ozt{5a~Tϰʵ \} ~ot׾66MFZRmi,5éy9xMzafmԍz?6kKh U-p_@SCY.ٔ,QTJ^8z V 6RU-7X-4kR~ZeF:.k'pgA*_b?6x0uYO@jOτM[9]"]u۪ayU\-;'ԏ_|i W]orՊsEm^ʽ^N !JuVෛ>}qW|B꿻혹{`wtP˭I&0V' )pqogvTŸkm({]f(VO`! # pzQyK9KMɬ,F xܑ3_'qu TMENDREP DELTA SVNx^wfsޜΉ-Uݺ[ݭgg8Ţ'նk|i kwswAXqd8^&O!60:aW (d:No@f>m7ART&5f?_xᄞXRHUJj܉E,SCٵVbYF p)b,,q?JDn0|W" `V62!mZ4# vs^ .WR*LUMt>|'H)De1H6Y}IHV`Lhh07 F&RE"q$qܛ0 w%/zk(Xm+O8/> A6_q|n[H<Βnt 3S.sc YkQJs z*CdeR _{b UEiڥDK i RNj#1{ihf0dzthDMhhwb88b`6 A!XɡOfx2`*FӧOkpNoO't*Bxdp2St|v8:ya"N3h`A,Cd +{2| -Q=N"J5l4<;Lt r쇣x0zenp@Wد퓙k~n6)G{83 (hxaS{8 & njA8`:_P LlbB~A ӳhv6ŋPk{jO^\N:,,g]r`!x|BRԌ'/fo^>Ai ^`%YJŠ}2wތvlPs L[un` Q1:#d Xt48|& biIݮ04AHBrX,MR?SqÇ8d1E&mJ:5sZ3>R9DLcRY}󜢅ܳ?8SΟMV5wQc|!f9W-yéWS%ԡbk7H?:jy[5u`f.-?My.Ȼ~JX{/.~\@0 É+k'릾w~!D;+{dSz@0ݾ~qyy aQ"%<o8!j=],flԬ^^BM M2I W2:󣵦նU#.:- r.$ŕH7L!CQ3ZMoU]̅#SaAak7RM505Ҋ31"5HvJuKtbUA рRU\bcd?AEr| L a@ =a\%+p6,$b<^*Mv`(ЛvH?[>m$`LcA^cJ phKmZ0t+ZIz*{趧 Z0{Sם9g9p&?ep#SKsT"T90;-d3l?%~n\D~X`K 8F[E,ãCʖcKFɮ7, dmW!ǖvvo4gXk\>-bےLt,x:!cfӁ`aTMqdB t[*x‹ vB@ށznZ ǂn%;Ā܋nw_[[]t-BgE&zD< HO'1YyjPXd^ۗ'.ZQ۸{ѣ|5/{-1mF%)IN!{53¯2ķiGX1"{HP' 8LU3=[6]R)piC0 X0`]genvQ4" 7]%6;ؾ>ti0p7ߜN,#H*s;\Bh-ŝffiA.+O7:rr:/аİVu2ė2jQ4)0h'Y@.Q'-<̍xA闐Q BxIҼj[ܵCJCu+ 7#pMVlFg@/ҍxBɂVƒBV܄(FɓU*&H@^qɡiiє6 P>{{XCkf!?js)Mgb͉g#nG޳sF1 aAK+~`E͖ryָ-j#])_1;"_ ¨)ϑ8 ]'+~A0b~N|)+a(%"\]oRBtQDʉo>뛫 9.ΰǷ \̶hbfkZS8z[Ɔ:*jj_2NvYקmՙFha@D cT2iO% PBQעWdU@+p2!'Իkp=( &&yBu'Q\)n6o[RݮtTL쀮.Fj0|u s&^24򮌼ޕ2UNh:. %קK42xqLd.RuvT CJG>ĚϨƪ@(~0խ rC (YɲIѣ޳6YJGSԅh цQأ@x!g\*Z}JU_=؉^u~}v>y_DDBIhg!>^"!Oq;yѻN,n Kii $*_2,zAay&eb` MGNx:zaŚaOwx< R Ipcb;,?gB/=ibqU>~>:(7:xCLmó QdCw `HA H*(sn, 8d]tyQS29ZyPX<*DIC񐬼- "ta~zE~D.Ёi' VHZ$W5oJJup=ViPN[4cXdS{aQ{lmؾaop^3AKRa=V=N[LvHْc:{7*XQ#ͼh)VMOwb_*+w~ӊj*TAJ֔Ug-Ej5u``pls*F\TfÊť/fϻK9"vBV||C0y]hA;,?rʬӇJ63mu(Q>V,~fae[\ElA-np3 j}E9gtQ{T"2*1ut >wcjcjdH%vADf×fr| .9H7$Wn~Ny | |IV /4AerraxEbOqp '_QE-{j1-ivKA|9&OuK5zHQS|C&Z! ?s4O[[C0S'{}^sMŰ9 ꦚ_Cט .o>NWgi asT!0"f6*C& &VG9f*t|~Zf"xIpN`t_#ahe<-?'Ō>󩪿FM܈U^?(n ׉ip@#~q4H b$ei,|fu{N|}K?VtJ{UpCr5R"x$$N/'75n>!C7`U%k-/qslǃ5%P9WU[źЪ)qRU=?XfBKATGr1* ڕIc,WWۿ_q[q+@vSۙJ4*N:ːWN<P2Da]oF<;QWCU֭:Wn}Y[_z+Xy n(!u7t?@ E}Q"+E QȺd*G%Оrpd=3a ======= and a few typ0s to fix >>>>>>> 3 . 1a <<<<<<< 1 . ENDREP DELTA SVNopooThis is a more complete test and a few typ0s to fix also I plan to add few lines and to remove other lines ENDREP DELTA SVN"$""4a >>>>>>> 3 . 4a <<<<<<< 2 New line ======= . 3a ||||||| 2 which multiple lines and a few typos to fix ======= and a few typ0s to fix >>>>>>> 3 . 1a <<<<<<< 1 . ENDREP DELTA SVNThis is a more complete test <<<<<<< 1 which multiple lines and a few typ0s to fix ||||||| 2 which multiple lines and a few typos to fix ======= and a few typ0s to fix >>>>>>> 3 also I plan to add few lines <<<<<<< 2 New line ======= >>>>>>> 3 and to remove other lines ENDREP DELTA SVNMOMM# $FreeBSD$ PACKAGE= tests ATF_TESTS_SH= diff3_test ${PACKAGE}FILES+= \ 1.txt \ 2.txt \ 3.txt \ 1.out \ 2.out \ 3.out \ 4.out \ 5.out \ 6.out \ 7.out \ 8.out \ 9.out .include ENDREP DELTA SVN,},,x^k0s_Po.; J׼jZiޠ" !7 htbN#&Q+B!4ˢRrw'ű݁8|d^hu&TYtz~7bu'K[UX?%ߴpLAENDREP id: 4-318888.0.r318888/10711 type: file count: 0 text: 318888 0 133 120 281a1725c5a0f61a87184a09584250c3 d72dd597d297974401db9e5dc22dca27e9593120 318887-6udk/_6 props: 179448 45543 103 0 bb58aa814bbdf5f7c1ab04a05656f5a5 cpath: /head/usr.bin/diff3/Makefile copyroot: 0 / id: 7-318888.0.r318888/10982 type: file count: 0 text: 318888 146 2264 5038 7b53daf4bb64032001d615f97c98bba5 eda14d49080a2e7d5074e537acb218303f447421 318887-6udk/_8 props: 179448 45543 103 0 bb58aa814bbdf5f7c1ab04a05656f5a5 cpath: /head/usr.bin/diff3/diff3.1 copyroot: 0 / id: 9-318888.0.r318888/11256 type: file count: 0 text: 318888 2423 6445 19099 51612505880b33f051e409996dd0f754 a8ed38732899ac8daae05611530f4b350d7ce2d6 318887-6udk/_a props: 179448 45543 103 0 bb58aa814bbdf5f7c1ab04a05656f5a5 cpath: /head/usr.bin/diff3/diff3.c copyroot: 0 / id: c-318888.0.r318888/11532 type: file count: 0 text: 318888 8881 194 177 61ce37e91904ed299fd81b59773b0a03 eb986c713c8ddcc67ec77380836710d75ab69f68 318887-6udk/_e props: 194474 46 33 0 d2b74571aba906f64dadd6584b7cea1d cpath: /head/usr.bin/diff3/tests/1.out copyroot: 0 / id: f-318888.0.r318888/11805 type: file count: 0 text: 318888 9088 149 132 a87ad1795b295f17f011108b773b7b05 5995fbe80afc5e97ff0c7f90a980df700bc2f06b 318887-6udk/_g props: 185029 785617 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/usr.bin/diff3/tests/1.txt copyroot: 0 / id: h-318888.0.r318888/12082 type: file count: 0 text: 318888 9250 42 30 c386a902d60969c68c151520b632e95b 9c7cf0e7e80593301419c5e8dad4e0cc19c80554 318887-6udk/_i props: 194474 46 33 0 d2b74571aba906f64dadd6584b7cea1d cpath: /head/usr.bin/diff3/tests/2.out copyroot: 0 / id: j-318888.0.r318888/12353 type: file count: 0 text: 318888 9305 158 141 3998df025ba70fd000e648dd0987b044 99f645abbc98d6042b3ca54c4a16ea24265cf4bb 318887-6udk/_k props: 185029 785617 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/usr.bin/diff3/tests/2.txt copyroot: 0 / id: l-318888.0.r318888/12630 type: file count: 0 text: 318888 9476 73 61 00b2fa8ec2bdbb27844054eb063a268e 95987b52f805ecae29eb0688060a14670a4a028f 318887-6udk/_m props: 194474 46 33 0 d2b74571aba906f64dadd6584b7cea1d cpath: /head/usr.bin/diff3/tests/3.out copyroot: 0 / id: n-318888.0.r318888/12901 type: file count: 0 text: 318888 9562 124 111 31134470128316e1f6846c14d29c9a95 f3b4450a111d6d2b03e9df076d0dc551c5c36324 318887-6udk/_o props: 185029 785617 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/usr.bin/diff3/tests/3.txt copyroot: 0 / id: p-318888.0.r318888/13178 type: file count: 0 text: 318888 9476 73 61 00b2fa8ec2bdbb27844054eb063a268e 95987b52f805ecae29eb0688060a14670a4a028f 318887-6udk/_q props: 194474 46 33 0 d2b74571aba906f64dadd6584b7cea1d cpath: /head/usr.bin/diff3/tests/4.out copyroot: 0 / id: r-318888.0.r318888/13449 type: file count: 0 text: 318888 9250 42 30 c386a902d60969c68c151520b632e95b 9c7cf0e7e80593301419c5e8dad4e0cc19c80554 318887-6udk/_s props: 194474 46 33 0 d2b74571aba906f64dadd6584b7cea1d cpath: /head/usr.bin/diff3/tests/5.out copyroot: 0 / id: t-318888.0.r318888/13720 type: file count: 0 text: 4 274761 4 0 d41d8cd98f00b204e9800998ecf8427e da39a3ee5e6b4b0d3255bfef95601890afd80709 318887-6udk/_u props: 194474 46 33 0 d2b74571aba906f64dadd6584b7cea1d cpath: /head/usr.bin/diff3/tests/6.out copyroot: 0 / id: v-318888.0.r318888/13986 type: file count: 0 text: 318888 8881 194 177 61ce37e91904ed299fd81b59773b0a03 eb986c713c8ddcc67ec77380836710d75ab69f68 318887-6udk/_w props: 194474 46 33 0 d2b74571aba906f64dadd6584b7cea1d cpath: /head/usr.bin/diff3/tests/7.out copyroot: 0 / id: x-318888.0.r318888/14259 type: file count: 0 text: 318888 9699 179 162 cf7d4052aabf11ca1f275255413a405b 87d607340a0a39a466a081ca4bd8e14fc45d7a77 318887-6udk/_y props: 194474 46 33 0 d2b74571aba906f64dadd6584b7cea1d cpath: /head/usr.bin/diff3/tests/8.out copyroot: 0 / id: z-318888.0.r318888/14532 type: file count: 0 text: 318888 9891 291 274 58ef3701c6e344ed43cfdf113778f506 ff8bf6fbe0a217fbca82417f8e9d8727b829a456 318887-6udk/_10 props: 194474 46 33 0 d2b74571aba906f64dadd6584b7cea1d cpath: /head/usr.bin/diff3/tests/9.out copyroot: 0 / id: 11-318888.0.r318888/14806 type: file count: 0 text: 318888 10195 222 205 a70d8450fc266f5473e91c923c880f4e b19214e93e4f875bbd15bb49b3dd96cdf0ec6291 318887-6udk/_12 props: 179448 45543 103 0 bb58aa814bbdf5f7c1ab04a05656f5a5 cpath: /head/usr.bin/diff3/tests/Makefile copyroot: 0 / id: 13-318888.0.r318888/15089 type: file count: 0 text: 318888 10430 268 1580 3e9ddef59e06b72e50e924076acb4d34 2519ea971b8df3351a16bbf5297a614a4d7ab1a3 318887-6udk/_14 props: 179448 47115 129 0 1679e77e4768dfb6af0762a02ac0cf72 cpath: /head/usr.bin/diff3/tests/diff3_test.sh copyroot: 0 / PLAIN K 5 1.out V 29 file c-318888.0.r318888/11532 K 5 1.txt V 29 file f-318888.0.r318888/11805 K 5 2.out V 29 file h-318888.0.r318888/12082 K 5 2.txt V 29 file j-318888.0.r318888/12353 K 5 3.out V 29 file l-318888.0.r318888/12630 K 5 3.txt V 29 file n-318888.0.r318888/12901 K 5 4.out V 29 file p-318888.0.r318888/13178 K 5 5.out V 29 file r-318888.0.r318888/13449 K 5 6.out V 29 file t-318888.0.r318888/13720 K 5 7.out V 29 file v-318888.0.r318888/13986 K 5 8.out V 29 file x-318888.0.r318888/14259 K 5 9.out V 29 file z-318888.0.r318888/14532 K 8 Makefile V 30 file 11-318888.0.r318888/14806 K 13 diff3_test.sh V 30 file 13-318888.0.r318888/15089 END ENDREP id: b-318888.0.r318888/16039 type: dir count: 0 text: 318888 15378 648 0 d2d11405114c745126fe27bb45d1b1a2 cpath: /head/usr.bin/diff3/tests copyroot: 0 / PLAIN K 8 Makefile V 29 file 4-318888.0.r318888/10711 K 7 diff3.1 V 29 file 7-318888.0.r318888/10982 K 7 diff3.c V 29 file 9-318888.0.r318888/11256 K 5 tests V 28 dir b-318888.0.r318888/16039 END ENDREP id: 2-318888.0.r318888/16396 type: dir count: 0 text: 318888 16193 190 0 ef16d04e685aad2beba55e05e9109171 cpath: /head/usr.bin/diff3 copyroot: 0 / PLAIN K 8 Makefile V 31 file 5q-1590.0-1591.r317658/174 K 14 Makefile.amd64 V 29 file 2-212526.0.r252356/99241 K 12 Makefile.arm V 28 file 5-212526.0.r247975/4301 K 13 Makefile.i386 V 29 file 7-212526.0.r252356/99545 K 12 Makefile.inc V 32 file 5t-1590.1-1591.r201386/6856 K 16 Makefile.powerpc V 30 file b-212526.0.r252356/100151 K 16 Makefile.sparc64 V 30 file d-212526.0.r252356/100458 K 9 addr2line V 27 dir q-275373.0.r298401/8457 K 5 alias V 30 dir 4-100200.0.r284345/1144695 K 5 apply V 28 dir 3-1591.0.r314436/1144654 K 2 ar V 27 dir 2-176434.0.r301974/1302 K 3 asa V 29 dir 2-96625.0.r284345/1147062 K 2 at V 23 dir 2-941.0.r303540/997 K 3 atm V 26 dir 4-121666.0.r313653/810 K 3 awk V 26 dir 7-85724.0.r314942/7015 K 6 banner V 24 dir 8-1591.0.r316797/639 K 8 basename V 28 dir a-1591.0.r314436/1146947 K 2 bc V 27 dir 8-202719.0.r314704/1605 K 4 biff V 28 dir e-1591.0.r314436/1148040 K 9 bluetooth V 27 dir 4v-107120.0.r313656/634 K 5 bmake V 28 dir c-241279.0.r318163/23524 K 8 brandelf V 25 dir 2-18962.0.r286136/577 K 6 bsdcat V 30 dir 74-299529.0.r315636/115919 K 6 bsdiff V 27 dir 4-148771.0.r316315/1007 K 5 bzip2 V 26 dir 4-78562.0.r315170/6491 K 12 bzip2recover V 27 dir 4-108667.0.r315170/7098 K 3 c89 V 29 dir 2-29545.0.r284345/1160714 K 3 c99 V 26 dir 4-104615.0.r285457/556 K 6 caesar V 34 dir o-2491.0-288485.r291738/155094 K 8 calendar V 25 dir i-1591.0.r317939/6608 K 8 cap_mkdb V 28 dir m-1591.0.r314436/1152948 K 6 catman V 26 dir 4-96845.0.r318600/1294 K 4 chat V 24 dir 2-4375.0.r311288/604 K 7 checknr V 28 dir o-1591.0.r314436/1154072 K 5 chkey V 26 dir 2-26241.0.r315170/7854 K 6 chpass V 25 dir s-1591.0.r315170/8863 K 5 cksum V 28 dir u-1591.0.r314436/1158577 K 5 clang V 31 dir 9d-208963.0.r314564/2764277 K 3 cmp V 28 dir w-1591.0.r314436/1161332 K 3 col V 25 dir y-1591.0.r315776/3555 K 6 colcrt V 29 dir 10-1591.0.r314436/1163615 K 7 colldef V 31 dir 2-6528.0-291115.r298170/996 K 5 colrm V 29 dir 12-1591.0.r314436/1164726 K 6 column V 29 dir 14-1591.0.r314436/1165846 K 4 comm V 29 dir 16-1591.0.r314436/1167000 K 10 compile_et V 26 dir 2t-3238.0.r315170/9512 K 8 compress V 26 dir 18-1591.0.r318592/1908 K 4 cpio V 29 dir 2-179323.0.r315636/117120 K 6 cpuset V 26 dir 2-176732.0.r303520/584 K 6 csplit V 26 dir 4-95926.0.r317942/3031 K 5 ctags V 29 dir 1e-1591.0.r314436/1172960 K 7 ctlstat V 29 dir 2o-229997.0.r315170/10934 K 3 cut V 29 dir 1i-1591.0.r314436/1174086 K 7 cxxfilt V 27 dir 2-282288.0.r298401/9069 K 2 dc V 27 dir u-202719.0.r314704/3746 K 4 diff V 27 dir 9-315051.0.r317381/1024 K 5 diff3 V 28 dir 2-318888.0.r318888/16396 K 7 dirname V 29 dir 1q-1591.0.r314436/1174846 K 3 dpv V 27 dir 1m-274116.0.r294863/617 K 5 drill V 28 dir b-255801.0.r315170/11546 K 3 dtc V 27 dir c-245803.0.r317060/6966 K 2 du V 29 dir 1s-1591.0.r314436/1175927 K 2 ee V 27 dir 2-10453.0.r315170/12230 K 8 elf2aout V 29 dir 2-93310.0.r284345/1187192 K 7 elfcopy V 28 dir u-275373.0.r315170/12834 K 7 elfdump V 28 dir 2-109313.0.r308606/14783 K 6 enigma V 26 dir 2-40768.0.r313329/5659 K 3 env V 29 dir 1u-1591.0.r314436/1177070 K 6 expand V 29 dir 1y-1591.0.r314436/1178179 K 6 factor V 34 dir 16-2491.1-288485.r315170/13589 K 5 false V 29 dir 20-1591.0.r314436/1179286 K 5 fetch V 25 dir 2-16505.0.r297384/628 K 4 file V 27 dir 22-1591.0.r315170/14276 K 6 file2c V 27 dir 2-5996.0.r299094/364901 K 4 find V 29 dir 24-1591.0.r314436/1183607 K 6 finger V 29 dir 26-1591.0.r314436/1187231 K 3 fmt V 29 dir 28-1591.0.r314436/1187981 K 4 fold V 27 dir 2a-1591.0.r318000/34941 K 7 fortune V 33 dir 1a-2491.2-288485.r316500/2561 K 4 from V 29 dir 2e-1591.0.r314436/1190163 K 5 fstat V 29 dir 2i-1591.0.r314436/1191469 K 5 fsync V 29 dir 4-63499.0.r284345/1198734 K 3 ftp V 27 dir 2k-1591.0.r315170/14983 K 5 gcore V 27 dir 4o-1590.0.r316286/45890 K 6 gencat V 25 dir 2-7496.0.r299356/4919 K 11 getaddrinfo V 28 dir a-315640.0.r317999/21008 K 7 getconf V 25 dir 4-59632.0.r318437/923 K 6 getent V 26 dir 4-158287.0.r301413/988 K 6 getopt V 25 dir 2-194.0.r308606/16199 K 5 gprof V 29 dir 4s-1590.0.r314436/1200420 K 4 grdc V 34 dir 2-4975.3-288485.r291738/167694 K 4 grep V 28 dir d-210389.0.r318574/14989 K 4 gzip V 27 dir k-166255.0.r313327/1267 K 4 head V 29 dir 2u-1591.0.r314436/1201518 K 7 hesinfo V 29 dir 2l-65532.0.r141580/125265 K 7 hexdump V 27 dir 2w-1591.0.r318000/37086 K 4 host V 26 dir 2-2989.0.r315170/15580 K 5 iconv V 30 dir 1o9-219019.0.r318000/37862 K 2 id V 29 dir 2y-1591.0.r314436/1207352 K 5 ident V 28 dir f-285890.0.r318000/38680 K 6 indent V 26 dir 30-1591.0.r318471/5155 K 5 ipcrm V 26 dir 2-2736.0.r315170/16258 K 4 ipcs V 26 dir 2-2731.0.r291558/25711 K 8 iscsictl V 29 dir 1w-255570.0.r315170/17228 K 4 join V 29 dir 32-1591.0.r314436/1208498 K 3 jot V 29 dir 34-1591.0.r314436/1209636 K 5 kdump V 28 dir 36-1591.0.r318736/212942 K 8 keylogin V 29 dir 2-26243.0.r284345/1216540 K 9 keylogout V 29 dir 2-26245.0.r284345/1217255 K 7 killall V 28 dir 2-9317.0.r284345/1217955 K 6 ktrace V 29 dir 38-1591.0.r314436/1212658 K 7 ktrdump V 27 dir 2-93504.0.r318000/39391 K 3 lam V 27 dir 3a-1591.0.r318000/40109 K 4 last V 27 dir 3c-1591.0.r318000/40829 K 8 lastcomm V 28 dir 3e-1591.0.r318736/214192 K 3 ldd V 24 dir 2v-696.0.r299952/627 K 5 leave V 29 dir 3i-1591.0.r314436/1217601 K 4 less V 27 dir 4-60789.0.r317829/32688 K 8 lessecho V 27 dir c-60789.0.r315170/19391 K 7 lesskey V 27 dir g-60789.0.r315170/19994 K 3 lex V 26 dir 2-2259.0.r315170/21679 K 6 limits V 26 dir 2-21924.0.r316500/3400 K 6 locale V 28 dir 2-105239.0.r315170/22367 K 9 localedef V 35 dir 5-286432.62-290494.r318278/2333 K 6 locate V 27 dir 3k-1591.0.r314449/20029 K 4 lock V 29 dir 3s-1591.0.r314436/1220388 K 5 lockf V 29 dir 2-21440.0.r284345/1232468 K 6 logger V 29 dir 3u-1591.0.r314436/1221505 K 5 login V 29 dir 3w-1591.0.r314436/1222863 K 6 logins V 30 dir 2-126700.0.r284345/1234810 K 7 logname V 29 dir 3y-1591.0.r314436/1223991 K 4 look V 29 dir 40-1591.0.r314436/1225499 K 6 lorder V 29 dir 42-1591.0.r314436/1226613 K 5 lsvfs V 28 dir 2-2965.0.r284345/1237661 K 8 lzmainfo V 28 dir u-207842.0.r315170/24470 K 2 m4 V 27 dir 44-1591.0.r315170/25970 K 4 mail V 29 dir 4a-1591.0.r314436/1238436 K 3 man V 27 dir 2-213317.0.r315142/1316 K 6 mandoc V 28 dir e-241754.0.r315170/26578 K 4 mesg V 29 dir 4o-1591.0.r314436/1239191 K 8 minigzip V 27 dir 2-31696.0.r315170/27290 K 8 ministat V 28 dir g-118856.0.r318000/41689 K 10 mkcsmapper V 30 dir 1oh-219019.0.r315170/28471 K 17 mkcsmapper_static V 30 dir 1ov-219019.0.r315170/29100 K 5 mkdep V 29 dir 4q-1591.0.r314436/1240718 K 6 mkesdb V 30 dir 1oz-219019.0.r315170/29971 K 13 mkesdb_static V 30 dir 1pd-219019.0.r315170/30602 K 6 mkfifo V 29 dir 4s-1591.0.r314436/1241838 K 5 mkimg V 34 dir 2-253923.0-263918.r318137/2990 K 8 mklocale V 34 dir 4u-1591.1-291115.r315170/31549 K 5 mkstr V 29 dir 4w-1591.0.r314436/1245369 K 6 mktemp V 29 dir 2-35193.0.r314436/1246073 K 6 mkuzip V 27 dir 4-135045.0.r318144/1807 K 5 morse V 33 dir 1y-2491.4-288485.r288485/1706 K 4 msgs V 29 dir 50-1591.0.r314436/1247587 K 2 mt V 26 dir 52-1591.0.r318185/7247 K 2 nc V 28 dir 9-141394.0.r315170/32248 K 4 ncal V 25 dir 2-31745.0.r308340/702 K 7 netstat V 27 dir 54-1591.0.r317035/29017 K 6 newgrp V 27 dir 2-97364.0.r298876/17666 K 6 newkey V 26 dir 2-26239.0.r305077/7123 K 7 nfsstat V 29 dir 56-1591.0.r314436/1254771 K 4 nice V 29 dir 58-1591.0.r314436/1255875 K 2 nl V 25 dir 4-76273.0.r303595/537 K 2 nm V 28 dir y-275373.0.r298401/10268 K 5 nohup V 29 dir 5b-1591.0.r314436/1256995 K 7 numactl V 30 dir 16-285387.0.r300050/131251 K 6 number V 33 dir 20-2491.5-288485.r288485/1913 K 8 opieinfo V 27 dir 2-22378.0.r315170/32904 K 7 opiekey V 27 dir 2-22380.0.r315170/33563 K 10 opiepasswd V 27 dir 2-22382.0.r315170/34227 K 8 pagesize V 29 dir 5d-1591.0.r314436/1258148 K 7 pamtest V 29 dir 2w-236109.0.r315170/34840 K 6 passwd V 27 dir 5f-1591.0.r314833/18903 K 5 paste V 29 dir 5h-1591.0.r314436/1260042 K 5 patch V 27 dir h-246074.0.r314704/4957 K 7 pathchk V 25 dir 2-97095.0.r302480/555 K 6 perror V 27 dir 4-192398.0.r313673/3564 K 3 pom V 34 dir 26-2491.6-288485.r318000/42446 K 2 pr V 25 dir 5l-1591.0.r316523/803 K 6 primes V 32 dir 2a-2491.7-288485.r306502/978 K 8 printenv V 29 dir 5n-1591.0.r314436/1261192 K 6 printf V 25 dir 5p-1591.0.r317598/974 K 11 proccontrol V 26 dir 4-306261.0.r317706/517 K 8 procstat V 28 dir 2-174199.0.r318325/11146 K 7 protect V 29 dir y-255708.0.r291563/217291 K 5 quota V 29 dir 5r-1591.0.r314436/1263493 K 6 random V 32 dir 2i-2491.8-288485.r301574/748 K 4 rctl V 28 dir 4-220166.0.r297633/60773 K 7 readelf V 28 dir 2-276587.0.r315170/35453 K 6 renice V 29 dir 5w-1591.0.r314436/1264616 K 9 resizewin V 26 dir 4-297897.0.r318481/589 K 3 rev V 29 dir 5y-1591.0.r314436/1265717 K 6 revoke V 26 dir 8-194267.0.r313666/579 K 6 rlogin V 29 dir 60-1591.0.r314436/1266488 K 6 rpcgen V 25 dir 2-1897.0.r311981/1417 K 7 rpcinfo V 25 dir 2-1900.0.r316500/4089 K 2 rs V 29 dir 62-1591.0.r314436/1267575 K 3 rsh V 27 dir 64-1591.0.r315170/36207 K 3 rup V 28 dir 2-2344.0.r314436/1269058 K 7 ruptime V 26 dir 66-1591.0.r314640/1296 K 6 rusers V 28 dir 2-2346.0.r314436/1270951 K 5 rwall V 28 dir 2-2348.0.r314436/1271701 K 4 rwho V 29 dir 68-1591.0.r314436/1272810 K 6 script V 29 dir 6e-1591.0.r314436/1273934 K 5 sdiff V 26 dir 7-298823.0.r316638/699 K 3 sed V 25 dir 6g-1591.0.r317378/990 K 7 send-pr V 29 dir 5-267577.0.r291563/218033 K 3 seq V 26 dir 4-204103.0.r305887/660 K 10 setchannel V 28 dir 2-165023.0.r288228/94512 K 4 shar V 29 dir 6k-1591.0.r314436/1280676 K 9 showmount V 29 dir 6m-1591.0.r314436/1281834 K 4 size V 29 dir 12-275373.0.r298401/11481 K 7 smbutil V 27 dir m-87874.0.r315170/36805 K 8 sockstat V 25 dir 2-45699.0.r315671/583 K 6 soelim V 35 dir 4-274836.0-282318.r315776/26394 K 4 sort V 27 dir 2-235267.0.r313891/1923 K 5 split V 29 dir 6t-1591.0.r314436/1282952 K 11 ssh-copy-id V 29 dir 4-241862.0.r298107/732982 K 4 stat V 25 dir 2-97953.0.r298599/618 K 6 stdbuf V 30 dir h-234772.0.r284345/1294129 K 7 strings V 29 dir 16-275373.0.r298401/12092 K 2 su V 29 dir 6x-1591.0.r314436/1284038 K 3 svn V 28 dir 8-251886.0.r315170/39302 K 6 systat V 26 dir 6z-1591.0.r317231/2425 K 4 tabs V 29 dir 2-97033.0.r284345/1315429 K 4 tail V 29 dir 71-1591.0.r314436/1296301 K 4 talk V 29 dir 73-1591.0.r314436/1302309 K 3 tar V 28 dir 2-127915.0.r315876/83907 K 5 tcopy V 29 dir 75-1591.0.r314436/1303421 K 3 tee V 29 dir 77-1591.0.r314436/1304515 K 6 telnet V 27 dir 79-1591.0.r315170/40671 K 5 tests V 30 dir 1x-257853.0.r299094/424567 K 4 tftp V 27 dir 7b-1591.0.r315170/41535 K 4 time V 29 dir 7d-1591.0.r314436/1307476 K 7 timeout V 27 dir 4-268745.0.r314944/5668 K 3 tip V 26 dir 7f-1591.0.r317280/1957 K 3 top V 26 dir 2-24144.0.r318448/1127 K 5 touch V 29 dir 8r-1591.0.r314436/1308587 K 4 tput V 29 dir 8t-1591.0.r314436/1310101 K 2 tr V 29 dir 8v-1591.0.r314436/1312206 K 4 true V 29 dir 8x-1591.0.r314436/1313310 K 8 truncate V 28 dir 4-63437.0.r299094/429299 K 5 truss V 27 dir 2-31567.0.r318879/12121 K 4 tset V 29 dir 8z-1591.0.r314436/1316807 K 5 tsort V 29 dir 91-1591.0.r314436/1317923 K 3 tty V 29 dir 93-1591.0.r314436/1319019 K 2 ul V 26 dir 95-1591.0.r302558/1469 K 5 uname V 29 dir 97-1591.0.r314436/1319777 K 8 unexpand V 27 dir 99-1591.0.r317583/19178 K 7 unifdef V 25 dir 9b-1591.0.r291697/931 K 4 uniq V 26 dir 9d-1591.0.r318316/1247 K 5 units V 25 dir 2-16187.0.r313664/987 K 5 unvis V 27 dir 9f-1591.0.r315170/44845 K 5 unzip V 27 dir 2-175154.0.r313663/1538 K 12 usbhidaction V 26 dir 4-113288.0.r288335/814 K 9 usbhidctl V 29 dir 4-62642.0.r284345/1340866 K 5 users V 29 dir 9h-1591.0.r314436/1322799 K 8 uudecode V 29 dir 9v-1591.0.r314436/1323580 K 8 uuencode V 25 dir 9x-1591.0.r314993/775 K 8 vacation V 27 dir 9z-1591.0.r315170/45504 K 6 vgrind V 29 dir a1-1591.0.r314436/1328897 K 2 vi V 26 dir 2-2082.0.r315170/46291 K 3 vis V 27 dir a5-1591.0.r315170/46931 K 6 vmstat V 25 dir a7-1591.0.r318713/649 K 9 vtfontcvt V 26 dir 9-267337.0.r305815/659 K 1 w V 27 dir a9-1591.0.r315170/47900 K 4 wall V 29 dir ab-1591.0.r314436/1334238 K 2 wc V 29 dir ad-1591.0.r314436/1335322 K 4 what V 29 dir af-1591.0.r314436/1336425 K 7 whereis V 26 dir aj-1591.0.r298879/4770 K 5 which V 24 dir 2-5888.0.r317161/576 K 3 who V 29 dir al-1591.0.r314436/1337177 K 5 whois V 29 dir an-1591.0.r314436/1338288 K 5 write V 29 dir aq-1591.0.r314436/1339398 K 5 xargs V 29 dir as-1591.0.r314436/1341028 K 8 xinstall V 27 dir au-1591.0.r315170/48702 K 5 xlint V 28 dir 2-12100.0.r308457/148967 K 2 xo V 28 dir 4-273568.0.r318364/43646 K 4 xstr V 29 dir aw-1591.0.r314436/1342550 K 2 xz V 28 dir y-207842.0.r315170/49305 K 5 xzdec V 29 dir 12-207842.0.r315170/49911 K 4 yacc V 27 dir ay-1591.0.r315170/50613 K 3 yes V 29 dir b2-1591.0.r314436/1343636 K 5 ypcat V 25 dir 4-1930.0.r287425/1554 K 7 ypmatch V 25 dir c-1930.0.r287425/2242 K 7 ypwhich V 26 dir k-1930.0.r315170/51303 K 4 zstd V 28 dir h-316978.0.r317999/21592 END ENDREP id: m-3.0.r318888/29418 type: dir pred: m-3.0.r318879/25130 count: 12749 text: 318888 16544 12861 0 e97299b730057ce6045ae4aca3098dc3 cpath: /head/usr.bin copyroot: 0 / PLAIN K 10 .arcconfig V 26 file 1-265842.0.r306435/41 K 8 .arclint V 27 file 1-266959.0.r281789/766 K 9 COPYRIGHT V 24 file 1-2656.0.r310963/99 K 5 LOCKS V 27 file 1-146890.0.r255635/270 K 11 MAINTAINERS V 25 file 1-94742.0.r316990/48 K 8 Makefile V 30 file 3-1594.0-1595.r316794/657 K 13 Makefile.inc1 V 25 file 5-38666.0.r318883/71 K 18 Makefile.libcompat V 34 file 5-38666.0-296709.r318105/1154 K 17 ObsoleteFiles.inc V 28 file 4-148330.0.r318881/4064 K 6 README V 26 file 1-21173.0.r318294/114 K 9 README.md V 27 file 1-314473.0.r314495/558 K 8 UPDATING V 26 file 1-41806.0.r318863/120 K 3 bin V 22 dir 1-5.0.r318502/5547 K 4 cddl V 27 dir 1-168404.0.r318831/8152 K 7 contrib V 27 dir 1-16755.0.r318884/13535 K 6 crypto V 27 dir 1-25405.0.r318242/25456 K 3 etc V 23 dir 1-38.0.r318861/5752 K 3 gnu V 22 dir 1-3.0.r318645/2587 K 7 include V 24 dir 1-697.0.r318780/6533 K 9 kerberos5 V 28 dir 4q-29815.0.r314657/11241 K 3 lib V 23 dir 6-5.0.r318879/10217 K 7 libexec V 22 dir c-5.0.r318739/4621 K 7 release V 25 dir 1-3027.0.r318872/2362 K 6 rescue V 28 dir 7-117035.0.r318000/18335 K 4 sbin V 23 dir fa-4.0.r318794/5279 K 6 secure V 25 dir r-1553.0.r317998/1495 K 5 share V 22 dir e-3.0.r318881/6586 K 3 sys V 22 dir g-5.0.r318880/5132 K 7 targets V 34 dir 2-242818.1-284345.r318334/1857 K 5 tests V 27 dir g-257097.0.r318593/3279 K 5 tools V 26 dir 43-1590.0.r318881/9172 K 7 usr.bin V 23 dir m-3.0.r318888/29418 K 8 usr.sbin V 23 dir q-3.0.r318816/78763 END ENDREP id: 5-1.0.r318888/31057 type: dir pred: 5-1.0.r318884/15193 count: 213763 text: 318888 29587 1457 0 0dc02dde63ce45aa93ba95dc654994e7 props: 318749 29946 2920 0 b535cb6dd5cf36cb52a75545b4547bf0 cpath: /head copyroot: 0 / minfo-cnt: 124 minfo-here: y PLAIN K 11 ROADMAP.txt V 26 file 0-179453.0.r285589/70 K 4 head V 23 dir 5-1.0.r318888/31057 K 8 projects V 22 dir 6-1.0.r318887/5670 K 7 release V 22 dir 7-1.0.r306421/3182 K 6 releng V 23 dir 8-1.0.r317487/36311 K 6 stable V 23 dir 9-1.0.r318886/90580 K 8 svnadmin V 27 dir 0-179447.0.r318573/1301 K 4 user V 23 dir a-1.0.r318862/34533 K 6 vendor V 22 dir b-1.0.r318674/9074 K 13 vendor-crypto V 26 dir 0-1575.0.r313155/61323 K 10 vendor-sys V 27 dir 0-12116.0.r317516/58029 END ENDREP id: 0.0.r318888/31795 type: dir pred: 0.0.r318887/6388 count: 318888 text: 318888 31307 475 0 3504def408e756755f31a813798e99eb props: 289270 0 4229 0 20f578acc837c5e58fc64b9eaa493aea cpath: / copyroot: 0 / minfo-cnt: 43759 _2.0.t318887-6udk add-dir false false /head/usr.bin/diff3 _4.0.t318887-6udk add-file true true /head/usr.bin/diff3/Makefile _7.0.t318887-6udk add-file true true /head/usr.bin/diff3/diff3.1 _9.0.t318887-6udk add-file true true /head/usr.bin/diff3/diff3.c _b.0.t318887-6udk add-dir false false /head/usr.bin/diff3/tests _c.0.t318887-6udk add-file true true /head/usr.bin/diff3/tests/1.out _f.0.t318887-6udk add-file true true /head/usr.bin/diff3/tests/1.txt _h.0.t318887-6udk add-file true true /head/usr.bin/diff3/tests/2.out _j.0.t318887-6udk add-file true true /head/usr.bin/diff3/tests/2.txt _l.0.t318887-6udk add-file true true /head/usr.bin/diff3/tests/3.out _n.0.t318887-6udk add-file true true /head/usr.bin/diff3/tests/3.txt _p.0.t318887-6udk add-file true true /head/usr.bin/diff3/tests/4.out _r.0.t318887-6udk add-file true true /head/usr.bin/diff3/tests/5.out _t.0.t318887-6udk add-file true true /head/usr.bin/diff3/tests/6.out _v.0.t318887-6udk add-file true true /head/usr.bin/diff3/tests/7.out _x.0.t318887-6udk add-file true true /head/usr.bin/diff3/tests/8.out _z.0.t318887-6udk add-file true true /head/usr.bin/diff3/tests/9.out _11.0.t318887-6udk add-file true true /head/usr.bin/diff3/tests/Makefile _13.0.t318887-6udk add-file true true /head/usr.bin/diff3/tests/diff3_test.sh 31795 32019