FreeBSD_HEAD-tests - Build #1217 - Still Unstable

expr/expr_test:overflow -> passed [0.812s] [192.168.10.2] out: bin/expr/expr_test:precedence -> passed [0.106s] [192.168.10.2] out: bin/expr/expr_test:regex -> passed [0.109s] [192.168.10.2] out: bin/cat/cat_test:align -> passed [0.098s] [192.168.10.2] out: bin/c

FreeBSD_HEAD-tests - Build #1218 - Fixed

FreeBSD_HEAD-tests - Build #1218 - Fixed: Build information: https://jenkins.FreeBSD.org/job/FreeBSD_HEAD-tests/1218/ Full change log: https://jenkins.FreeBSD.org/job/FreeBSD_HEAD-tests/1218/changes Full build log: https://jenkins.FreeBSD.org/job/FreeBSD_HEAD-tests/1218/console Change summaries:

[CFT] rewrite of the merge(1) utility

Hi all, I was botherd to not have the merge(1) utility available in base (for etcupdate) when building base WITHOUT_RCS. So I have rewritten a merge(1) utility which should be compatible. I used the 3-way merge code from the fossil VCS instead of making it call diff3. All I have done from the fo