From: martin rudalics <rudalics@gmx.at>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: 38456@debbugs.gnu.org
Subject: bug#38456: 27.0.50; Assertion failure in 'smerge-match-conflict'
Date: Wed, 22 Jan 2020 18:44:56 +0100 [thread overview]
Message-ID: <900e8d92-2130-013d-b917-73829e2d130e@gmx.at> (raw)
In-Reply-To: <jwvmuagtyr5.fsf-monnier+emacs@gnu.org>
> Oh, yes, thank you. I've suffered through those many times as well ;-)
> The patch below should fix it.
Thanks for the fix. I'll check the next time I see a conflict. One
thing that should be fixed too, if easily possible, is to gray out the
previous/next conflict menu entries whenever we are at the first/last
conflict. Smerging can be a painful job (often enough I don't even know
whether the upper or lower represents the one I want to keep) so
avoiding any possible confusions should be a main goal IMHO.
martin
prev parent reply other threads:[~2020-01-22 17:44 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-02 9:54 bug#38456: 27.0.50; Assertion failure in 'smerge-match-conflict' martin rudalics
2020-01-18 10:06 ` Stefan Kangas
2020-01-21 19:24 ` Stefan Monnier
2020-01-21 19:54 ` Eli Zaretskii
2020-01-21 20:59 ` Stefan Monnier
2020-01-22 17:44 ` martin rudalics [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=900e8d92-2130-013d-b917-73829e2d130e@gmx.at \
--to=rudalics@gmx.at \
--cc=38456@debbugs.gnu.org \
--cc=monnier@iro.umontreal.ca \
/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.