freebsd-update and mergemaster

Lowell Gilbert freebsd-questions-local at be-well.ilk.org
Mon Mar 3 15:55:39 UTC 2008


Chris Maness <chris at chrismaness.com> writes:

> I was wondering if it was possible to use mergemaster with the binary
> update tool.  It seemed like a much better way than freebsd-update
> dumping me into vi.  I don't understand what it wants me to do with
> vi.  Mergemaster is very clear.  Can someone please shed light.

Mergemaster just uses sdiff(1).  Perhaps freebsd-update can be
configured (e.g., with an EDITOR setting) to do the same?


More information about the freebsd-questions mailing list