e5a180e78d
this affects smerge-next vs smerge-vc-next-conflict, which is only available from emacs 27 on, which will check for conflicts in all open buffers. |
||
---|---|---|
.. | ||
git | ||
github | ||
perforce | ||
version-control |
e5a180e78d
this affects smerge-next vs smerge-vc-next-conflict, which is only available from emacs 27 on, which will check for conflicts in all open buffers. |
||
---|---|---|
.. | ||
git | ||
github | ||
perforce | ||
version-control |