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

[Common] Add git conflict marker highlighting #4047

Open
wants to merge 17 commits into
base: master
Choose a base branch
from

Merge branch 'master' into pr/common/git-conflict-markers

e0be5bd
Select commit
Loading
Failed to load commit list.
Sign in for the full log view
Open

[Common] Add git conflict marker highlighting #4047

Merge branch 'master' into pr/common/git-conflict-markers
e0be5bd
Select commit
Loading
Failed to load commit list.
Test on dev build
succeeded Nov 23, 2024 in 21s