bug#74509: Feature request - smerge-mode

[Eli Zaretskii <eliz@gnu.org>]

> From: Branislav Zahradník <happy.barney@gmail.com>
> Date: Sun, 22 Dec 2024 10:46:17 +0100
> Cc: Eli Zaretskii <eliz@gnu.org>, 74509@debbugs.gnu.org
> 
> On Sun, 22 Dec 2024 at 03:54, Stefan Monnier <monnier@iro.umontreal.ca> wrote:
> 
>  >> How should we go about this bug report?
>  >> Can we make some progress here?  Or should we close it as wontfix?
>  > No, I think his commands make sense.  We just need to improve them so
>  > they also work with 3-part conflicts.
> 
>  I just pushed to `master` a version of `smerge-extend` which can
>  incorporate both following and preceding lines, and works with both
>  diff2 and diff3 style conflicts.
> 
>  The OP also suggested binding this new command as well as `smerge-swap`
>  in the SMerge minor mode map (to `C-c ^ x` and `C-c ^ s` respectively).
>  That would shadow `M-x` and `M-s` (when `smerge-mode` is active) for
>  users who configured `smerge-command-prefix` to be ESC, so I think that
>  could be problematic.  For that reason, I did not include that part.
> 
> Thank you very much. Such code is at the moment beyond my elisp capabilities :-)
> 
> Key bindings were "nice to have", it's not a problem to configure it manually.
> With current implementation I'd probably have two bindings anyway.
> 
> I will think about bindings and will come with suggestion later (if/when I will have something usable)

Should we close this bug or should we leave it open?