From mboxrd@z Thu Jan  1 00:00:00 1970
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org
X-Spam-Level: 
X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham
	autolearn_force=no version=3.4.4
Received: (qmail 8030 invoked from network); 4 Mar 2023 20:08:21 -0000
Received: from 9front.inri.net (168.235.81.73)
  by inbox.vuxu.org with ESMTPUTF8; 4 Mar 2023 20:08:21 -0000
Received: from mimir.eigenstate.org ([206.124.132.107]) by 9front; Sat Mar  4 15:06:59 -0500 2023
Received: from stockyard.lan (ue.tmodns.net [172.58.231.173])
	by mimir.eigenstate.org (OpenSMTPD) with ESMTPSA id 58f2419f (TLSv1.2:ECDHE-RSA-AES256-SHA:256:NO)
	for <9front@9front.org>;
	Sat, 4 Mar 2023 12:06:56 -0800 (PST)
Message-ID: <4BF088E8E2BA7811D4B46CA8BADA693C@eigenstate.org>
To: 9front@9front.org
Date: Sat, 04 Mar 2023 15:06:54 -0500
From: ori@eigenstate.org
In-Reply-To: <ACDD6CD317B26520C3F6D7C3AEF69009@eigenstate.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="US-ASCII"
Content-Transfer-Encoding: 7bit
List-ID: <9front.9front.org>
List-Help: <http://lists.9front.org>
X-Glyph: ➈
X-Bullshit: ISO-certified polling event 
Subject: Re: [9front] merge3: a first draft
Reply-To: 9front@9front.org
Precedence: bulk

Quoth ori@eigenstate.org:
> Quoth ori@eigenstate.org:
> > I've been annoyed that we have to use ape/diff3 to merge
> > files for a while, so I finally sat down this weekend and
> > hacked 3-way merge capabilities into diff(1).
> > 
> > This is a rough draft, but here's the current approach.
> > 
> > 3 way merging operates as follows:
> > 
> 
> Now bugfixed, and with tests.
> 

hearing no objections: pushed.