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 357
Star 10.3k

Code
Issues 387
Pull requests 120
Discussions
Actions
Projects 1
Wiki
Security
Insights

Additional navigation options

Code
Issues
Pull requests
Discussions
Actions
Projects
Wiki
Security
Insights

merge_tools: clean up Diff/MergeEditor interface#3180

Merged

yuja merged 5 commits intojj-vcs:mainjj-vcs/jj:mainfrom yuja:push-tpskzltzorsuyuja/jj:push-tpskzltzorsuCopy head branch name to clipboard

Mar 2, 2024

+143-179

Conversation Commits5 (5)Checks Files changed

Commits

Commits on Mar 2, 2024

merge_tools: move run_mergetool() to MergeEditor::edit_file()
yuja
committed
merge_tools: capture base_ignores and "ui.diff-instructions" by DiffEditor
yuja
committed
merge_tools: inline edit_diff() into DiffEditor::edit()
yuja
committed
merge_tools: move "ui.diff-instructions" to CLI and config/misc.toml
yuja
committed
cli: add thin wrapper that runs --interactive diff editor conditionally
yuja
committed

Footer

© 2025 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Docs
Contact

You can’t perform that action at this time.