From owner-freebsd-doc@FreeBSD.ORG  Thu Dec 23 00:41:31 2004
Return-Path: <owner-freebsd-doc@FreeBSD.ORG>
Delivered-To: freebsd-doc@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id E4EF716A4CE; Thu, 23 Dec 2004 00:41:31 +0000 (GMT)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id C69C043D2F; Thu, 23 Dec 2004 00:41:31 +0000 (GMT)
	(envelope-from keramida@FreeBSD.org)
Received: from freefall.freebsd.org (keramida@localhost [127.0.0.1])
	by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id iBN0fVjb055902;
	Thu, 23 Dec 2004 00:41:31 GMT
	(envelope-from keramida@freefall.freebsd.org)
Received: (from keramida@localhost)
	by freefall.freebsd.org (8.13.1/8.13.1/Submit) id iBN0fVS1055898;
	Thu, 23 Dec 2004 00:41:31 GMT
	(envelope-from keramida)
Date: Thu, 23 Dec 2004 00:41:31 GMT
From: Giorgos Keramidas <keramida@FreeBSD.org>
Message-Id: <200412230041.iBN0fVS1055898@freefall.freebsd.org>
To: keramida@FreeBSD.org, freebsd-doc@FreeBSD.org,
	keramida@FreeBSD.org
Subject: Re: docs/74231: Conflicting information on mergemaster -p
X-BeenThere: freebsd-doc@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Documentation project <freebsd-doc.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-doc>,
	<mailto:freebsd-doc-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-doc>
List-Post: <mailto:freebsd-doc@freebsd.org>
List-Help: <mailto:freebsd-doc-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-doc>,
	<mailto:freebsd-doc-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Dec 2004 00:41:32 -0000

Synopsis: Conflicting information on mergemaster -p

Responsible-Changed-From-To: freebsd-doc->keramida
Responsible-Changed-By: keramida
Responsible-Changed-When: Thu Dec 23 00:41:15 GMT 2004
Responsible-Changed-Why: 
I'll handle this.

http://www.freebsd.org/cgi/query-pr.cgi?pr=74231