From: ori@eigenstate.org
To: 9front@9front.org
Subject: Re: [9front] merge3: a first draft
Date: Sat, 04 Mar 2023 15:06:54 -0500 [thread overview]
Message-ID: <4BF088E8E2BA7811D4B46CA8BADA693C@eigenstate.org> (raw)
In-Reply-To: <ACDD6CD317B26520C3F6D7C3AEF69009@eigenstate.org>
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.
prev parent reply other threads:[~2023-03-04 20:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-12 23:17 ori
2023-02-25 16:56 ` ori
2023-03-04 20:06 ` ori [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4BF088E8E2BA7811D4B46CA8BADA693C@eigenstate.org \
--to=ori@eigenstate.org \
--cc=9front@9front.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).