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.

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

merge_tools: allow setting conflict marker style per-tool #4951

Merged
merged 1 commit into from
Nov 26, 2024

merge_tools: allow setting conflict marker style per-tool

1e547e6
Select commit
Loading
Failed to load commit list.
Merged

merge_tools: allow setting conflict marker style per-tool #4951

merge_tools: allow setting conflict marker style per-tool
1e547e6
Select commit
Loading
Failed to load commit list.
Google CLA / cla/google succeeded Nov 26, 2024 in 1s

✅ All contributors are covered under a CLA with Google

See https://cla.developers.google.com/ for more info about Google's Contributor License Agreement (CLA).

ℹ️ Googlers: Go here to view more details and manage scans for this pull request.

Details

The following contributors were found for this pull request:

✅ 1e547e6 Author: @scott2000 <sc*****x8​@gmail.com>, <scot*******lor​@jpmchase.com>

(Only the first commit for a unique contributor is listed.)

View more details on Google CLA