Worked on the martinvonz/jj repository to enhance merge workflows by integrating mergiraf as the default CLI merge tool. Focused on CLI configuration using TOML, the work introduced structured settings for deterministic merges and optimized performance through the use of the --fast argument for structural merges. Explicit exit codes were defined to improve error handling and enable robust automation in downstream tooling and CI environments. The changes standardized merge behavior across projects, making merges more predictable and easier to manage. Documentation and deployment of the new configuration ensured consistent usage, laying groundwork for future improvements in automation and user experience.