From owner-freebsd-current@freebsd.org  Tue Jul 24 01:54:17 2018
Return-Path: <owner-freebsd-current@freebsd.org>
Delivered-To: freebsd-current@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 19B231032585
 for <freebsd-current@mailman.ysv.freebsd.org>;
 Tue, 24 Jul 2018 01:54:17 +0000 (UTC)
 (envelope-from fbsd@www.zefox.net)
Received: from www.zefox.net (www.zefox.net [50.1.20.27])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "www.zefox.org", Issuer "www.zefox.org" (not verified))
 by mx1.freebsd.org (Postfix) with ESMTPS id 71C7978323
 for <freebsd-current@freebsd.org>; Tue, 24 Jul 2018 01:54:15 +0000 (UTC)
 (envelope-from fbsd@www.zefox.net)
Received: from www.zefox.net (localhost [127.0.0.1])
 by www.zefox.net (8.15.2/8.15.2) with ESMTPS id w6O1sUhG049398
 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO);
 Mon, 23 Jul 2018 18:54:31 -0700 (PDT)
 (envelope-from fbsd@www.zefox.net)
Received: (from fbsd@localhost)
 by www.zefox.net (8.15.2/8.15.2/Submit) id w6O1sSs8049397;
 Mon, 23 Jul 2018 18:54:28 -0700 (PDT) (envelope-from fbsd)
Date: Mon, 23 Jul 2018 18:54:28 -0700
From: bob prohaska <fbsd@www.zefox.net>
To: "Herbert J. Skuhra" <herbert@gojira.at>
Cc: freebsd-current@freebsd.org, bob prohaska <fbsd@www.zefox.net>
Subject: Re: ntpd as ntpd user question
Message-ID: <20180724015428.GB47869@www.zefox.net>
References: <5b90c49f-4616-9ef7-28a1-6445137245ef@nomadlogic.org>
 <1532191655.1344.80.camel@freebsd.org>
 <4b7acbd2-0230-345c-4370-24a72d0b492a@nomadlogic.org>
 <1532193285.1344.83.camel@freebsd.org>
 <20180721174722.GA40167@www.zefox.net>
 <1532196850.1344.87.camel@freebsd.org>
 <20180721220925.GA40238@www.zefox.net>
 <20180721234941.2ojf76kxxqfhnys7@mail.bsd4all.net>
 <20180723045552.GA44941@www.zefox.net>
 <87r2jtiw59.wl-herbert@gojira.at>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <87r2jtiw59.wl-herbert@gojira.at>
User-Agent: Mutt/1.5.24 (2015-08-30)
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
 <freebsd-current.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current/>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Jul 2018 01:54:17 -0000

On Mon, Jul 23, 2018 at 09:34:26PM +0200, Herbert J. Skuhra wrote:
> 
> Yes, first you press m. Then you will see differences of installed
> file (left) and new file (right). Then you press either l or
> r:
> 
> l | 1:	choose left diff
> r | 2:	choose right diff
> 
> If the diff tries to remove/add to many lines you can:
> 
> el:	edit left diff
> er:	edit right diff
> 
> And if done you can view the merged file (v) before installing (i) it.
> 
> I am sure, someone can explain it better! :)
> 

Perhaps, but you've made the essential point. Your reply let me understand that 
mergemaster does not really "master" the merge, it rather identifies files needing 
to be merged and then starts sdiff to let me modify files. Never having even looked 
at sdiff, the learning curve proved very steep. Too steep, in fact.

I'm going to try a more incremental approach. 

Thank you _very_ much!

bob prohaska