Date: Mon, 01 Jan 2007 08:34:16 -0500 From: Lowell Gilbert <freebsd-questions-local@be-well.ilk.org> To: Dan Casey <dcasey@debtresolve.com> Cc: freebsd-questions@freebsd.org Subject: Re: mergemaster and vimdiff Message-ID: <4464bqc1lz.fsf@Lowell-Desk.lan> In-Reply-To: <45953BF3.5020705@debtresolve.com> (Dan Casey's message of "Fri, 29 Dec 2006 11:01:55 -0500") References: <45953BF3.5020705@debtresolve.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Dan Casey <dcasey@debtresolve.com> writes: > Is there anyway to use vimdiff with mergemaster. Not easily; the diff(1) command is hard-wired into the mergemaster script. However, you could do your own comparison with MM_EXIT_SCRIPT. Also, remember that mergemaster is just a shell script itself, and you can use it as a base for your own version. > Or is it safe to just see what files are different in etc, and vimdiff > them manually? It's safe, but not necessarily easy. mergemaster is a lot easier than doing it by hand. Before mergemaster was added to the system, I used this script: http://Be-Well.Ilk.Org/~lowell/systuff/scripts/update-etc and then diff'd by hand. Are you aware of the '-a' option for mergemaster? That will leave you with a tree that contains only the files that mergemaster thinks need a human to look at... > I see /var/tmp/temproot has a lot more in it that I was > expecting. I thought it would be just etc. Most of that is directories without files, though; *almost* everything that can actually be changed is in /etc.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4464bqc1lz.fsf>