From owner-freebsd-stable@FreeBSD.ORG  Mon Jan 28 07:59:03 2013
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id EE360F38
 for <freebsd-stable@freebsd.org>; Mon, 28 Jan 2013 07:59:03 +0000 (UTC)
 (envelope-from boland37@xs4all.nl)
Received: from smtp-vbr9.xs4all.nl (smtp-vbr9.xs4all.nl [194.109.24.29])
 by mx1.freebsd.org (Postfix) with ESMTP id 73141F21
 for <freebsd-stable@freebsd.org>; Mon, 28 Jan 2013 07:59:02 +0000 (UTC)
Received: from charlemagne.boland.org (37-251-74-118.FTTH.ispfabriek.nl
 [37.251.74.118]) (authenticated bits=0)
 by smtp-vbr9.xs4all.nl (8.13.8/8.13.8) with ESMTP id r0S7wtR9019543
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
 Mon, 28 Jan 2013 08:58:56 +0100 (CET)
 (envelope-from boland37@xs4all.nl)
Message-ID: <51062FBF.10507@xs4all.nl>
Date: Mon, 28 Jan 2013 08:58:55 +0100
From: Michiel Boland <boland37@xs4all.nl>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:17.0) Gecko/20130114 Thunderbird/17.0.2
MIME-Version: 1.0
To: Kevin Oberman <kob6558@gmail.com>
Subject: Re: mergemaster -p / installkernel problem
References: <51057DA1.2090408@xs4all.nl>
 <CAN6yY1sPz+BH9O3dnyiH3Mv+u27BLuhkvbPdR7LSCmb9j=VkRg@mail.gmail.com>
In-Reply-To: <CAN6yY1sPz+BH9O3dnyiH3Mv+u27BLuhkvbPdR7LSCmb9j=VkRg@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: by XS4ALL Virus Scanner
Cc: FreeBSD Stable <freebsd-stable@freebsd.org>
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Jan 2013 07:59:04 -0000

On 01/28/2013 02:10, Kevin Oberman wrote:
> You don't by any chance have a mergemaster.rc in /etc or
> .mergemasterrc in $HOME?
>

Duh... I'll go stand in the corner for the next 37 years.

Cheers
Michiel