From: Stefan Monnier <monnier@IRO.UMontreal.CA>
To: charles@aurox.ch (Charles A. Roelli)
Cc: 32991@debbugs.gnu.org, juri@linkov.net
Subject: bug#32991: 27.0.50; diff-auto-refine-mode a no-op
Date: Sun, 03 Feb 2019 07:37:36 -0500 [thread overview]
Message-ID: <jwv8syxaw1w.fsf-monnier+emacsbugs@gnu.org> (raw)
In-Reply-To: <m2tvhlumhr.fsf@aurox.ch> (Charles A. Roelli's message of "Sun, 03 Feb 2019 12:42:24 +0100")
> Why are 2-way conflicts worthless?
Because they give less info than 3-way conflicts and they're generated
from 3 files so you can "always" get the superior 3-way conflicts
instead of the inferior 2-way ones.
> By the way, does the updated change I sent in
> https://debbugs.gnu.org/cgi/bugreport.cgi?bug=32991#38 look okay
> to you?
Haven't had a chance to look at it yet,
Stefan
next prev parent reply other threads:[~2019-02-03 12:37 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-08 18:30 bug#32991: 27.0.50; diff-auto-refine-mode a no-op Charles A. Roelli
2018-10-08 21:00 ` Stefan Monnier
2018-10-09 19:15 ` Charles A. Roelli
2018-10-09 19:54 ` Stefan Monnier
2018-10-10 18:31 ` Charles A. Roelli
2018-10-10 19:21 ` Stefan Monnier
2018-10-13 13:42 ` Charles A. Roelli
2018-10-13 18:51 ` Stefan Monnier
2019-01-13 14:36 ` Charles A. Roelli
2019-01-13 20:03 ` Charles A. Roelli
2019-01-13 23:33 ` Stefan Monnier
2019-01-15 20:25 ` Charles A. Roelli
2019-02-11 20:14 ` Stefan Monnier
2019-02-18 19:06 ` Charles A. Roelli
2019-02-18 20:44 ` Stefan Monnier
2019-02-24 16:12 ` Charles A. Roelli
2019-02-27 15:04 ` Stefan Monnier
2019-03-03 20:51 ` Charles A. Roelli
2019-03-05 21:38 ` Juri Linkov
2019-03-07 19:23 ` Charles A. Roelli
2019-01-30 21:04 ` Juri Linkov
2019-02-01 7:38 ` Stefan Monnier
2019-02-03 11:42 ` Charles A. Roelli
2019-02-03 12:37 ` Stefan Monnier [this message]
2019-02-03 14:19 ` Charles A. Roelli
2019-02-11 20:15 ` Stefan Monnier
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=jwv8syxaw1w.fsf-monnier+emacsbugs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=32991@debbugs.gnu.org \
--cc=charles@aurox.ch \
--cc=juri@linkov.net \
/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.