oyui
Share on:
Enter Your Mastodon Instance
Copy the link below to share to Mastodon
https://terminaltrove.com/oyui/
A modern merge editor for jujutsu and git.
Script Preview
Review this script before executing in your terminal.
oyui is a modern interactive TUI merge tool and diff editor for Jujutsu and Git.
It focuses on staging, merge editing and seeing file changes with syntax highlighting. It has a scriptable config (using the Rune language) with hot reloading, config LSP support and 40+ built-in themes.
Optionally, you can navigate using the command palette to perform bulk operations. It has binary support which allows you to infer and handle binary file formats, vim mode-specific keybindings, nested config hooks and live configuration changes.
For users of jujitsu that regularly use jj or developers used to Git, this tool is useful as a way of performing daily merge decisions with a binary aware diff and merge editor.
