Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

usage issue with smerge mode #17

Open
laampui opened this issue Jun 24, 2022 · 0 comments
Open

usage issue with smerge mode #17

laampui opened this issue Jun 24, 2022 · 0 comments

Comments

@laampui
Copy link

laampui commented Jun 24, 2022

this is the init.el file

(load "~/.emacs.d/elpa/auto-rename-tag-20220616.1856/auto-rename-tag.el")
(require 'auto-rename-tag)
(add-hook 'html-mode-hook #'auto-rename-tag-mode)

Assuming this demo.html has some conflicts and smerge-mode turned on
image

when smerge-mode turned on, if I do smerge-keep-upper(C-c ^ u), the merge result will become this

image

if I do smerge-keep-lower (C-c ^ l), the merge result will become this

image

@laampui laampui changed the title a bug with smerge mode usage issue with smerge mode Jun 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant