From owner-freebsd-questions  Wed Oct  3  9:51:51 2001
Delivered-To: freebsd-questions@freebsd.org
Received: from forrie.net (forrie.net [216.67.14.69])
	by hub.freebsd.org (Postfix) with ESMTP id B592537B403
	for <freebsd-questions@freebsd.org>; Wed,  3 Oct 2001 09:51:49 -0700 (PDT)
Received: from boom.forrie.com (forrie.ne.mediaone.net. [24.147.132.133])
            by forrie.net with id f93GpmL52649
            for <freebsd-questions@freebsd.org>; Wed, 3 Oct 2001 12:51:48 -0400 (EDT)
Message-Id: <5.1.0.14.2.20011003124958.02053a00@216.67.14.69>
X-Sender: forrie@216.67.14.69
X-Mailer: QUALCOMM Windows Eudora Version 5.1
Date: Wed, 03 Oct 2001 12:51:47 -0400
To: freebsd-questions@freebsd.org
From: Forrest Aldrich <forrie@forrie.com>
Subject: Problems with mergmaster on a serial console
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"; format=flowed
Sender: owner-freebsd-questions@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-questions.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-questions>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-questions>
X-Loop: FreeBSD.ORG


We've had a long standing problem with mergmaster on our serial (dialup) 
consoles.   The problem being that some diffs include character sequences 
that are interpreted by our CPM console as commands, often locking it up 
and making it completely useless.

Is there a way to get mergemaster to suppress performing the diff outputs 
(unless explicity asked for)?  This may help solve the problem.


Thanks.


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-questions" in the body of the message