From owner-freebsd-questions@FreeBSD.ORG  Fri Dec 29 16:02:09 2006
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
X-Original-To: freebsd-questions@freebsd.org
Delivered-To: freebsd-questions@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 9338316A47C
	for <freebsd-questions@freebsd.org>;
	Fri, 29 Dec 2006 16:02:09 +0000 (UTC)
	(envelope-from dcasey@debtresolve.com)
Received: from debtresolve.com (ip175-18.wp-ny-us.debtresolve.com
	[66.236.175.18])
	by mx1.freebsd.org (Postfix) with ESMTP id 5B61613C478
	for <freebsd-questions@freebsd.org>;
	Fri, 29 Dec 2006 16:02:09 +0000 (UTC)
	(envelope-from dcasey@debtresolve.com)
Received: from dummy.name; Fri, 29 Dec 2006 11:02:17 -0500
Message-ID: <45953BF3.5020705@debtresolve.com>
Date: Fri, 29 Dec 2006 11:01:55 -0500
From: Dan Casey <dcasey@debtresolve.com>
User-Agent: Thunderbird 1.5.0.9 (Windows/20061207)
MIME-Version: 1.0
To: freebsd-questions@freebsd.org
X-Enigmail-Version: 0.94.1.1
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Subject: mergemaster and vimdiff
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Dec 2006 16:02:09 -0000

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.