Skip to content

Avoid redefining conflict marker faces from smerge-mode #23

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Dec 9, 2024

Avoid redefining conflict marker faces from smerge-mode

5bb1da1
Select commit
Loading
Failed to load commit list.
Sign in for the full log view
Merged

Avoid redefining conflict marker faces from smerge-mode #23

Avoid redefining conflict marker faces from smerge-mode
5bb1da1
Select commit
Loading
Failed to load commit list.

Annotations

2 warnings

The logs for this run have expired and are no longer available.