all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Richard Stallman <rms@gnu.org>
To: "João Távora" <joaotavora@gmail.com>
Cc: 321942@gmail.com, eliz@gnu.org, emacs-devel@gnu.org
Subject: Re: Making git as easy as CVS, for handling merge conflicts
Date: Mon, 11 Nov 2019 22:15:49 -0500	[thread overview]
Message-ID: <E1iUMej-0005hl-P5@fencepost.gnu.org> (raw)
In-Reply-To: <CALDnm50kaJ0Fi1LKBSUTy-fbOT09xHoetv2VFMoSzUGD47s+sQ@mail.gmail.com> (message from João Távora on Mon, 11 Nov 2019 09:45:44 +0000)

[[[ To any NSA and FBI agents reading my email: please consider    ]]]
[[[ whether defending the US Constitution against all enemies,     ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]

  > I think that ediff3, or ediff-files3, is an Emacs interface to the diff3
  > algorithm, which I know does the same for three versions, but,
  > perhaps much like you, it confuses me a lot.  Some people do
  > prefer to handle merge conflicts with it.

If so, why did a VC command invoke this automatically
without my requesting it?

-- 
Dr Richard Stallman
Founder, Free Software Foundation (https://gnu.org, https://fsf.org)
Internet Hall-of-Famer (https://internethalloffame.org)





  parent reply	other threads:[~2019-11-12  3:15 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <E1iOsKE-0002r0-8I@fencepost.gnu.org>
     [not found] ` <a88c5249-d62f-dc4c-e567-6fc4b3b3ea43@gmail.com>
     [not found]   ` <CAOkDyE8DP8cy9WHJ3TCKK=5fBZvuo1yCXtEfwb=iVgDEBtw+pQ@mail.gmail.com>
     [not found]     ` <o8xvx0tv.321942@gmail.com>
     [not found]       ` <20191101145220.qowvzqnkolnwp5kr@gmail.com>
     [not found]         ` <E1iRTO2-0006LS-4k@fencepost.gnu.org>
     [not found]           ` <4ac15ac98a94eec8ed58c505d70c4f77cd5114fb.camel@gnu.org>
     [not found]             ` <20191104124109.wv5f5xstpds4giuk@gmail.com>
     [not found]               ` <E1iRpIa-0007a2-LA@fencepost.gnu.org>
     [not found]                 ` <aa126d23fa3361944b1a9811b8a215035f15e290.camel@gnu.org>
     [not found]                   ` <E1iSZeG-0003Oz-7M@fencepost.gnu.org>
     [not found]                     ` <83mud7g5cd.fsf@gnu.org>
     [not found]                       ` <E1iSnTX-0005KO-1m@fencepost.gnu.org>
     [not found]                         ` <83eeyje7qw.fsf@gnu.org>
     [not found]                           ` <E1iTHOl-0005HU-IY@fencepost.gnu.org>
     [not found]                             ` <83h83da232.fsf@gnu.org>
     [not found]                               ` <E1iTV5v-0002SG-10@fencepost.gnu.org>
     [not found]                                 ` <83mud499w7.fsf@gnu.org>
     [not found]                                   ` <7e48izb8.321942@gmail.com>
2019-11-11  3:03                                     ` Making git as easy as CVS, for handling merge conflicts Richard Stallman
2019-11-11  3:37                                       ` Óscar Fuentes
2019-11-12  3:18                                         ` Richard Stallman
2019-11-12  7:16                                           ` Eli Zaretskii
2019-11-11  6:40                                       ` Dmitry Alexandrov
2019-11-11  9:33                                         ` martin rudalics
2019-11-11 18:34                                           ` Dmitry Alexandrov
2019-11-12  8:10                                             ` martin rudalics
2019-11-16  8:29                                               ` Dmitry Alexandrov
2019-11-16  8:57                                                 ` martin rudalics
2019-11-12  3:17                                         ` Richard Stallman
2019-11-11  9:45                                       ` João Távora
2019-11-11 10:36                                         ` Eli Zaretskii
2019-11-11 10:49                                           ` João Távora
2019-11-11 11:04                                             ` Eli Zaretskii
2019-11-12  3:15                                         ` Richard Stallman [this message]
2019-11-12  7:15                                           ` Eli Zaretskii

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=E1iUMej-0005hl-P5@fencepost.gnu.org \
    --to=rms@gnu.org \
    --cc=321942@gmail.com \
    --cc=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=joaotavora@gmail.com \
    /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. 
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.