We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
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
this is the init.el file
init.el
(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
demo.html
smerge-mode
when smerge-mode turned on, if I do smerge-keep-upper(C-c ^ u), the merge result will become this
smerge-keep-upper(C-c ^ u)
if I do smerge-keep-lower (C-c ^ l), the merge result will become this
smerge-keep-lower (C-c ^ l)
The text was updated successfully, but these errors were encountered:
No branches or pull requests
this is the
init.el
fileAssuming this
demo.html
has some conflicts andsmerge-mode
turned onwhen
smerge-mode
turned on, if I dosmerge-keep-upper(C-c ^ u)
, the merge result will become thisif I do
smerge-keep-lower (C-c ^ l)
, the merge result will become thisThe text was updated successfully, but these errors were encountered: