Deleted Added
full compact
2c2
< # $FreeBSD: head/Makefile 250719 2013-05-16 21:26:46Z sjg $
---
> # $FreeBSD: head/Makefile 251107 2013-05-29 19:16:59Z crees $
68,69c68,69
< # 8. `make delete-old'
< # 9. `mergemaster' (you may wish to use -i, along with -U or -F).
---
> # 8. `mergemaster' (you may wish to use -i, along with -U or -F).
> # 9. `make delete-old'