Skip to content

Explore
By company size
By use case
By industry
View all solutions
Topics
- AI
- DevOps
- Security
- Software Development
- View all
Explore
- GitHub Sponsors
  Fund open source developers
- The ReadME Project
  GitHub community articles
Repositories
- Enterprise platform
  AI-powered developer platform
Available add-ons
Pricing

Search code, repositories, users, issues, pull requests...

Search

Clear

Search syntax tips

Provide feedback

We read every piece of feedback, and take your input very seriously.

Include my email address so I can be contacted

Saved searches

Use saved searches to filter your results more quickly

Name

Query

To see all available qualifiers, see our documentation.

Sign in

Sign up

You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session. You switched accounts on another tab or window. Reload to refresh your session.

Dismiss alert

martinvonz / jj Public

Notifications You must be signed in to change notification settings
Fork 323
Star 9.4k

Code
Issues 365
Pull requests 121
Discussions
Actions
Projects 1
Wiki
Security
Insights

Additional navigation options

Code
Issues
Pull requests
Discussions
Actions
Projects
Wiki
Security
Insights

build

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

Sign in to view logs

Sign in to view logs

merge_tools: allow setting conflict marker style per-tool

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

Summary
Jobs
Run details
- Usage
- Workflow file

Usage Workflow file

build (macos-13)

succeeded Nov 26, 2024 in 8m 30s

Loading

Re-running jobs...

You can’t perform that action at this time.