Daniel O'Connor wrote:
This work does look neat, but..
Try etcmerge :)
It's a bit of a pain to get started with it, but it is a *lot* faster (human
input wise) than mergemaster. It only asks you about files that you have
modified rather than ones that have been changed by committers (ie does a 3
way merge).
It does have problems handling DB files, but that is usually not a big problem
to fix.
I read about etcmerge in BSD Hacks and there's been no going back for
me. It seems pretty stable even though it's not been updated for a good
while. Is there any chance it will ever make it into the FreeBSD core
system?
Ashley
_______________________________________________
freebsd-hackers@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-hackers
To unsubscribe, send any mail to "[EMAIL PROTECTED]"
