Lines Matching full:merge

4 	Merge with NetBSD make, pick up
13 	Merge with NetBSD make, pick up
20 	Merge with NetBSD make, pick up
28 	Merge with NetBSD make, pick up
40 	Merge with NetBSD make, pick up
47 	Merge with NetBSD make, pick up
57 	Merge with NetBSD make, pick up
68 	Merge with NetBSD make, pick up
74 	Merge with NetBSD make, pick up
83 	Merge with NetBSD make, pick up
89 	Merge with NetBSD make, pick up
98 	Merge with NetBSD make, pick up
114 	Merge with NetBSD make, pick up
125 	Merge with NetBSD make, pick up
132 	Merge with NetBSD make, pick up
139 	Merge with NetBSD make, pick up
145 	Merge with NetBSD make, pick up
152 	Merge with NetBSD make, pick up
167 	Merge with NetBSD make, pick up
177 	Merge with NetBSD make, pick up
184 	Merge with NetBSD make, pick up
191 	Merge with NetBSD make, sync up below change.
201 	Merge with NetBSD make, pick up
208 	Merge with NetBSD make, pick up
215 	Merge with NetBSD make, pick up
222 	Merge with NetBSD make, pick up
229 	Merge with NetBSD make, pick up
240 	Merge with NetBSD make, pick up
247 	Merge with NetBSD make, pick up
254 	Merge with NetBSD make, pick up
261 	Merge with NetBSD make, pick up
268 	Merge with NetBSD make, pick up
274 	Merge with NetBSD make, pick up
296 	Merge with NetBSD make, pick up
303 	Merge with NetBSD make, pick up
311 	Merge with NetBSD make, pick up
317 	Merge with NetBSD make, pick up
323 	Merge with NetBSD make, pick up
349 	Merge with NetBSD make, pick up
358 	Merge with NetBSD make, pick up
365 	Merge with NetBSD make, pick up
375 	Merge with NetBSD make, pick up
386 	Merge with NetBSD make, pick up
395 	Merge with NetBSD make, pick up
404 	Merge with NetBSD make, pick up
413 	Merge with NetBSD make, pick up
419 	Merge with NetBSD make, pick up
428 	Merge with NetBSD make, pick up
434 	Merge with NetBSD make, pick up
441 	Merge with NetBSD make, pick up
451 	Merge with NetBSD make, pick up
462 	Merge with NetBSD make, pick up
469 	Merge with NetBSD make, pick up
477 	Merge with NetBSD make, pick up
485 	Merge with NetBSD make, pick up
492 	Merge with NetBSD make, pick up
502 	Merge with NetBSD make, pick up
510 	Merge with NetBSD make, pick up
516 	Merge with NetBSD make, pick up
525 	Merge with NetBSD make, pick up
531 	Merge with NetBSD make, pick up
538 	Merge with NetBSD make, pick up
566 	Merge with NetBSD make, pick up
581 	Merge with NetBSD make, pick up
588 	Merge with NetBSD make, pick up
600 	Merge with NetBSD make, pick up
606 	Merge with NetBSD make, pick up
613 	Merge with NetBSD make, pick up
619 	Merge with NetBSD make, pick up
626 	Merge with NetBSD make, pick up
642 	Merge with NetBSD make, pick up
652 	Merge with NetBSD make, pick up
660 	Merge with NetBSD make, pick up
668 	Merge with NetBSD make, pick up
676 	Merge with NetBSD make, pick up
683 	Merge with NetBSD make, pick up
697 	Merge with NetBSD make, pick up
715 	Merge with NetBSD make, pick up
725 	Merge with NetBSD make, pick up
734 	Merge with NetBSD make, pick up
744 	Merge with NetBSD make, pick up
765 	Merge with NetBSD make, pick up
793 	Merge with NetBSD make, pick up
800 	Merge with NetBSD make, pick up
808 	Merge with NetBSD make, pick up
816 	Merge with NetBSD make, pick up
826 	Merge with NetBSD make, pick up
832 	Merge with NetBSD make, pick up
864 	Merge with NetBSD make, pick up
871 	Merge with NetBSD make, pick up
880 	Merge with NetBSD make, pick up
888 	Merge with NetBSD make, pick up
900 	Merge with NetBSD make, pick up
906 	Merge with NetBSD make, pick up
914 	Merge with NetBSD make, pick up
920 	Merge with NetBSD make, pick up
926 	Merge with NetBSD make, pick up
933 	Merge with NetBSD make, pick up
940 	Merge with NetBSD make, pick up
957 	Merge with NetBSD make, pick up
964 	Merge with NetBSD make, pick up
971 	Merge with NetBSD make, pick up
985 	Merge with NetBSD make, pick up
998 	Merge with NetBSD make, pick up
1008 	Merge with NetBSD make, pick up
1023 	Merge with NetBSD make, pick up
1030 	Merge with NetBSD make, pick up
1036 	Merge with NetBSD make, pick up
1047 	Merge with NetBSD make, pick up
1053 	Merge with NetBSD make, pick up
1059 	Merge with NetBSD make, pick up
1065 	Merge with NetBSD make, pick up
1073 	Merge with NetBSD make, pick up
1079 	Merge with NetBSD make, pick up
1092 	Merge with NetBSD make, pick up
1100 	Merge with NetBSD make, pick up
1121 	Merge with NetBSD make, pick up
1139 	Merge with NetBSD make, pick up
1145 	Merge with NetBSD make, pick up
1155 	Merge with NetBSD make, pick up
1167 	Merge with NetBSD make, pick up
1180 	Merge with NetBSD make, pick up
1188 	Merge with NetBSD make, pick up
1196 	Merge with NetBSD make, pick up
1205 	Merge with NetBSD make, pick up
1215 	Merge with NetBSD make, pick up
1218 	o hash.c: merge duplicate code for finding an entry in a hash table
1226 	Merge with NetBSD make, pick up
1237 	Merge with NetBSD make, pick up
1249 	Merge with NetBSD make, pick up
1256 	Merge with NetBSD make, pick up
1279 	merge calls to ApplyModifier_Time
1280 	merge duplicate code for modifiers 'gmtime' and 'localtime'
1289 	Merge with NetBSD make, pick up
1296 	merge duplicate types CondEvalResult and CondResult
1316 	Merge with NetBSD make, pick up
1336 	merge duplicate code for memory handling in Var_Parse
1347 	Merge with NetBSD make, pick up
1363 	Merge with NetBSD make, pick up
1366 	o var.c: merge branches for modifiers ':D' and ':U'
1374 	Merge with NetBSD make, pick up
1389 	Merge with NetBSD make, pick up
1397 	Merge with NetBSD make, pick up
1444 	Merge with NetBSD make, pick up
1490 	Merge with NetBSD make, pick up
1501 	Merge with NetBSD make, pick up
1507 	Merge with NetBSD make, pick up
1518 	Merge with NetBSD make, pick up
1528 	Merge with NetBSD make, pick up
1535 	Merge with NetBSD make, pick up
1545 	Merge with NetBSD make, pick up
1553 	Merge with NetBSD make, pick up
1561 	Merge with NetBSD make, pick up
1574 	Merge with NetBSD make, pick up
1584 	Merge with NetBSD make, pick up
1594 	Merge with NetBSD make, pick up
1601 	Merge with NetBSD make, pick up
1631 	Merge with NetBSD make, pick up
1641 	Merge with NetBSD make, pick up
1650 	Merge with NetBSD make, pick up
1687 	Merge with NetBSD make, pick up
1693 	Merge with NetBSD make, pick up
1710 	merge SetVar into Var_SetWithFlags
1723 	Merge with NetBSD make, pick up
1729 	Merge with NetBSD make, pick up
1743 	Merge with NetBSD make, pick up
1752 	Merge with NetBSD make, pick up
1760 	Merge with NetBSD make, pick up
1767 	Merge with NetBSD make, pick up
1776 	Merge with NetBSD make, pick up
1809 	Merge with NetBSD make, pick up
1818 	Merge with NetBSD make, pick up
1824 	Merge with NetBSD make, pick up
1868 	Merge with NetBSD make, pick up
1913 	Merge with NetBSD make, pick up
1941 	Merge with NetBSD make, pick up
1971 	Merge with NetBSD make, pick up
1987 	Merge with NetBSD make, pick up
1999 	Merge with NetBSD make, pick up
2010 	Merge with NetBSD make, pick up
2037 	Merge with NetBSD make, pick up
2046 	Merge with NetBSD make, pick up
2074 	Merge with NetBSD make, pick up
2086 	Merge with NetBSD make, pick up
2112 	Merge with NetBSD make, pick up
2137 	Merge with NetBSD make, pick up
2145 	o parse.c: merge curFile into includes
2155 	Merge with NetBSD make, pick up
2206 	Merge with NetBSD make, pick up
2224 	Merge with NetBSD make, pick up
2243 	Merge with NetBSD make, pick up
2268 	Merge with NetBSD make, pick up
2279 	Merge with NetBSD make, pick up
2285 	Merge with NetBSD make, pick up
2297 	Merge with NetBSD make, pick up
2318 	Merge with NetBSD make, pick up
2338 	Merge with NetBSD make, pick up
2347 	Merge with NetBSD make, pick up
2354 	Merge with NetBSD make, pick up
2364 	Merge with NetBSD make, pick up
2382 	Merge with NetBSD make, pick up
2392 	Merge with NetBSD make, pick up
2401 	Merge with NetBSD make, pick up
2407 	Merge with NetBSD make, pick up
2418 	Merge with NetBSD make, pick up
2430 	Merge with NetBSD make, pick up
2439 	Merge with NetBSD make, pick up
2450 	Merge with NetBSD make, pick up
2457 	Merge with NetBSD make, pick up
2465 	Merge with NetBSD make, pick up
2472 	Merge with NetBSD make, pick up
2487 	Merge with NetBSD make, pick up
2494 	Merge with NetBSD make, pick up
2500 	Merge with NetBSD make, pick up
2507 	Merge with NetBSD make, pick up
2515 	Merge with NetBSD make, pick up
2523 	Merge with NetBSD make, pick up
2535 	Merge with NetBSD make, pick up
2542 	Merge with NetBSD make, pick up
2548 	Merge with NetBSD make, pick up
2557 	Merge with NetBSD make, pick up
2568 	Merge with NetBSD make, pick up
2580 	Merge with NetBSD make, pick up
2587 	Merge with NetBSD make, pick up
2595 	Merge with NetBSD make, pick up
2618 	Merge with NetBSD make, pick up
2626 	Merge with NetBSD make, pick up
2634 	Merge with NetBSD make, pick up
2640 	Merge with NetBSD make, pick up
2646 	Merge with NetBSD make, pick up
2652 	Merge with NetBSD make, pick up
2667 	Merge with NetBSD make, pick up
2673 	Merge with NetBSD make, pick up
2681 	Merge with NetBSD make, pick up
2695 	Merge with NetBSD make, pick up
2707 	Merge with NetBSD make, pick up
2713 	Merge with NetBSD make, pick up
2721 	Merge with NetBSD make, pick up
2739 	Merge with NetBSD make, pick up
2746 	Merge with NetBSD make, pick up
2752 	Merge with NetBSD make, pick up
2773 	Merge with NetBSD make, pick up
2780 	Merge with NetBSD make, pick up
2787 	Merge with NetBSD make, pick up
2800 	  Merge with NetBSD make, pick up
2807 	  Merge with NetBSD make, pick up
2830 	  Merge with NetBSD make, pick up
2838 	  Merge with NetBSD make, pick up
2847 	  Merge with NetBSD make, pick up
2853 	  Merge with NetBSD make, pick up
2864 	  Merge with NetBSD make, pick up
2870 	  Merge with NetBSD make, pick up
2877 	  Merge with NetBSD make, pick up
2883 	  Merge with NetBSD make, pick up
2889 	  Merge with NetBSD make, pick up
2895 	  Merge with NetBSD make, pick up
2911 	  Merge with NetBSD make, pick up
2918 	  Merge with NetBSD make, pick up
2944 	  Merge with NetBSD make, pick up
2951 	  Merge with NetBSD make, pick up
2958 	  forgot to update after merge on 20170708 ;-)
2971 	  Merge with NetBSD make, pick up
2991 	  Merge with NetBSD make, pick up
2997 	  Merge with NetBSD make, pick up
3004 	  Merge with NetBSD make, pick up
3010 	  Merge with NetBSD make, pick up
3023 	  Merge with NetBSD make, pick up
3031 	  Merge with NetBSD make, pick up
3037 	  Merge with NetBSD make, pick up
3044 	  Merge with NetBSD make, pick up
3050 	  Merge with NetBSD make, pick up
3058 	  Merge with NetBSD make, pick up
3064 	  Merge with NetBSD make, pick up
3073 	  Merge with NetBSD make, pick up
3079 	  Merge with NetBSD make, pick up
3085 	  Merge with NetBSD make, pick up
3092 	  Merge with NetBSD make, pick up
3098 	  Merge with NetBSD make, pick up
3113 	  Merge with NetBSD make, pick up
3121 	  Merge with NetBSD make, pick up
3129 	  Merge with NetBSD make, pick up
3137 	  Merge with NetBSD make, pick up
3143 	  Merge with NetBSD make, pick up
3152 	  Merge with NetBSD make, pick up
3166 	  Merge with NetBSD make, pick up
3174 	  Merge with NetBSD make, pick up
3181 	  Merge with NetBSD make, pick up
3189 	  Merge with NetBSD make, pick up
3200 	  Merge with NetBSD make, pick up
3206 	  Merge with NetBSD make, pick up
3213 	  Merge with NetBSD make, pick up
3222 	  Merge with NetBSD make, pick up
3228 	  Merge with NetBSD make, pick up
3236 	  Merge with NetBSD make, pick up
3244 	  Merge with NetBSD make, pick up
3250 	  Merge with NetBSD make, pick up
3260 	  Merge with NetBSD make, pick up
3282 	  Merge with NetBSD make, pick up
3294 	  Merge with NetBSD make, pick up
3302 	  Merge with NetBSD make, pick up
3309 	  Merge with NetBSD make, pick up
3319 	  Merge with NetBSD make, pick up
3325 	  Merge with NetBSD make, pick up
3338 	  Merge with NetBSD make, pick up
3352 	  Merge with NetBSD make, pick up
3362 	  Merge with NetBSD make, pick up
3383 	  Merge with NetBSD make, pick up
3398 	  Merge with NetBSD make, pick up
3406 	  Merge with NetBSD make, pick up
3412 	  Merge with NetBSD make, pick up
3422 	  Merge with NetBSD make, pick up
3454 	  Merge with NetBSD make, pick up
3465 	  Merge with NetBSD make, pick up
3472 	  Merge with NetBSD make, pick up
3478 	  Merge with NetBSD make, pick up
3486 	  Merge with NetBSD make, pick up
3493 	  Merge with NetBSD make, pick up
3507 	  Merge with NetBSD make, pick up
3519 	  Merge with NetBSD make, pick up
3526 	  Merge with NetBSD make, pick up
3538 	  Merge with NetBSD make, pick up
3546 	  Merge with NetBSD make, pick up
3559 	  Merge with NetBSD make, pick up
3570 	  Merge with NetBSD make, pick up
3577 	  Merge with NetBSD make, pick up
3589 	* Merge with NetBSD make, pick up
3596 	  Merge with NetBSD make, pick up
3627 	  Merge with NetBSD make, pick up
3635 	  Merge with NetBSD make, pick up
3658 	  Merge with NetBSD make, pick up
3671 	  Merge with NetBSD make, pick up
3678 	  Merge with NetBSD make, pick up
3690 	  Merge with NetBSD make, pick up
3706 	  Merge with NetBSD make, pick up
3718 	  Merge with NetBSD make, pick up
3727 	  Merge with NetBSD make, pick up
3736 	  Merge with NetBSD make, pick up
3751 	  Merge with NetBSD make, pick up
3757 	  Merge with NetBSD make, pick up
3769 	  Merge with NetBSD make, pick up
3775 	  Merge with NetBSD make, pick up
3785 	  and def's of MAP_COPY etc. we got dups from a merge.
3790 	  Merge with NetBSD make, pick up
3799           Merge with NetBSD make, pick up
3807 	  Merge with NetBSD make, pick up
3818 	  Merge with NetBSD make, pick up
3833 	  Merge with NetBSD make, pick up
3845 	  Merge with NetBSD make, pick up
3851 	  Merge with NetBSD make, pick up
3858 	  Merge with NetBSD make, pick up
3867 	  Merge with NetBSD make, pick up
3873 	  Merge with NetBSD make, pick up
3879 	* Merge with NetBSD make, pick up
3885 	  Merge with NetBSD make, pick up
3894 	  Merge with NetBSD make, pick up
3903 	  Merge with NetBSD make, pick up
3910 	  Merge with NetBSD make, pick up
3918 	  Merge with NetBSD make, pick up
3931 	  Merge with NetBSD make, pick up
3938 	  Merge with NetBSD make, pick up
3947 	  Merge with NetBSD make, pick up
3953 	  Merge with NetBSD make, pick up
3964 	  Merge with NetBSD make, pick up
3972 	  Merge with NetBSD make, pick up
3982 	  Merge with NetBSD make, pick up
3992 	  Merge with NetBSD make, pick up
3998 	  Merge with NetBSD make, pick up
4005 	  Merge with NetBSD make, pick up
4016 	  Merge with NetBSD make, pick up
4039 	  Merge with NetBSD make, pick up
4053 	  Merge with NetBSD make, pick up
4060 	  Merge with NetBSD make, pick up
4072 	  Merge with NetBSD make, pick up
4080 	  Merge with NetBSD make, pick up
4086 	  Merge with NetBSD make, pick up
4096 	  Merge with NetBSD make, pick up
4102 	  Merge with NetBSD make, pick up
4111 	  Merge with NetBSD make, pick up
4119 	  Merge with NetBSD make, pick up
4127 	  Merge with NetBSD make, pick up
4133 	  Merge with NetBSD make, pick up
4142 	* Merge with NetBSD make, pick up
4160 	* Merge with NetBSD make, pick up
4168 	* Merge with NetBSD make, pick up
4176 	* Merge with NetBSD make, pick up
4183 	* Merge with NetBSD make, pick up
4202 	* Merge with NetBSD make, pick up
4215 	* Merge with NetBSD make, pick up:
4221 	* Merge with NetBSD make, pick up:
4237 	* Merge with NetBSD make, pick up:
4244 	* Merge with NetBSD make, pick up:
4255 	* Merge with NetBSD make, pick up:
4268 	* Merge with NetBSD make, pick up:
4282 	* Merge with NetBSD make, pick up:
4288 	* Merge with NetBSD make, pick up:
4309 	* Merge with NetBSD make, pick up:
4325 	* Merge with NetBSD make, pick up:
4336 	* Merge with NetBSD make, pick up:
4345 	* Merge with NetBSD make, pick up:
4355 	* Merge with NetBSD make, pick up:
4362 	* Merge with NetBSD make, pick up:
4367 	* merge some patches from NetBSD pkgsrc.
4373 	* Merge with NetBSD make, pick up:
4379 	* Merge with NetBSD make, pick up:
4387 	* Merge with NetBSD make, pick up:
4406 	* Merge with NetBSD make, pick up:
4415 	* Merge with NetBSD make, pick up:
4429 	* Merge with NetBSD make, pick up:
4439 	* Merge with NetBSD make, pick up:
4447 	* Merge with NetBSD make, pick up:
4457 	* Merge with NetBSD make, pick up:
4467 	* Merge with NetBSD make, pick up:
4477 	* Merge with NetBSD make, pick up:
4485 	* Merge with NetBSD make, pick up:
4509 	* job.c (JobFinish): fix likely ancient merge lossage
4533 	* Merge with NetBSD make, pick up:
4539 	* Merge with NetBSD make, pick up:
4546 	* Merge with NetBSD make, pick up:
4558 	* Merge with NetBSD make, pick up:
4577 	* Merge with NetBSD make, pick up:
4589 	* Merge with NetBSD make, pick up:
4598 	* Merge with NetBSD make, pick up:
4610 	* Merge with NetBSD make, pick up:
4631 	* Merge with NetBSD make, pick up:
4637 	* Merge with NetBSD make, pick up:
4647 	* Merge with NetBSD make, pick up:
4661 	* Merge with NetBSD make, pick up:
4668 	* Merge with NetBSD make
4676 	* Merge with NetBSD make, pick up:
4693 	* Merge with NetBSD make 
4718 	* Merge with NetBSD make
4734 	* Merge with NetBSD make
4755 	* Merge with NetBSD make
4761 	* Merge with NetBSD make
4769 	* Merge with NetBSD make
4775 	* Merge with NetBSD make (mmm 10th anniversary!)
4786 	* Merge with NetBSD make.
4804 	* Merge with NetBSD make.
4819 	* Merge with NetBSD make.
4845 	* Merge with NetBSD make (NetBSD-1.6)
4853 	* Merge with NetBSD make
4868 	* job.c (JobFinish): Fix an earlier merge bug that resulted in
4910 	* Merge with NetBSD make, changes include: