[issue1185] need a tool to merge changes into /etc

["Peter Avalos \(via DragonFly issue tracker\)" <sinknull@xxxxxxxxxxxxxxxxxxxxxxx>]

Peter Avalos <pavalos@theshell.com> added the comment:

What about putting /etc under git control?  make upgrade can do a merge and then
if there's a conflict, git would complain.

_____________________________________________________
DragonFly issue tracker <bugs@lists.dragonflybsd.org>
<http://bugs.dragonflybsd.org/issue1185>
_____________________________________________________