Date: Fri, 29 Dec 2006 11:01:55 -0500 From: Dan Casey <dcasey@debtresolve.com> To: freebsd-questions@freebsd.org Subject: mergemaster and vimdiff Message-ID: <45953BF3.5020705@debtresolve.com>
next in thread | raw e-mail | index | archive | help
Is there anyway to use vimdiff with mergemaster. Or is it safe to just see what files are different in etc, and vimdiff them manually? I see /var/tmp/temproot has a lot more in it that I was expecting. I thought it would be just etc.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?45953BF3.5020705>