Skip to content

Navigation Menu

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.

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

jj-vcs / jj Public

Notifications You must be signed in to change notification settings
Fork 349
Star 10k

Code
Issues 372
Pull requests 123
Discussions
Actions
Projects 1
Wiki
Security
Insights

Additional navigation options

Code
Issues
Pull requests
Discussions
Actions
Projects
Wiki
Security
Insights

Back to pull request #4951

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

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 #5719

Summary
Jobs
- flake check (ubuntu-latest)
- flake check (macos-14)
Run details
- Usage
- Workflow file

Usage Workflow file

flake check (ubuntu-latest)

flake check (ubuntu-latest)

succeeded Nov 26, 2024 in 6m 0s

Loading

Re-running jobs...

You can’t perform that action at this time.