Skip to content

usage issue with smerge mode #17

@laampui

Description

@laampui

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

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions