Automating MERGEMASTER(8)

Pieter de Goeje pieter at
Fri Mar 16 23:50:28 UTC 2007

On Friday 16 March 2007 10:32, Kyrre Nygård wrote:
> Hello,
> Is it possible to make MERGEMASTER(8) automatically replace files
> with a FreeBSD CVS Id, and skip (or prompt interactively) the ones
> without a FreeBSD CVS Id? The ones without are most certainly my own
> personalized configuration files. I'd really like to keep them
> intact. And on every MERGEMASTER(8) session I tend to replace every
> single file but them.
> Thanks everyone!
> All the best,
> Kyrre
mergemaster -U



More information about the freebsd-questions mailing list