The merge-in-editor feature of freebsd-update's merge tool is quite good. It does, however, lack important features:
- side-by-side chunk-wise change selection without using an editor
- option to outright replace the old file with the new file
- option to retain the old file entirely
These features are present in mergemaster. Freebsd-update's merge tool is a significant regression.
Wow this is old. I don't even know if it's relevant anymore. Feel free to close it.