Skip to content

Instantly share code, notes, and snippets.

@hroi
Last active May 19, 2024 19:24
Show Gist options
  • Save hroi/152cc6e6091ed0f514075afc9b7ea4cc to your computer and use it in GitHub Desktop.
Save hroi/152cc6e6091ed0f514075afc9b7ea4cc to your computer and use it in GitHub Desktop.
scm-diff-editor as external editor in Jujutsu (jj)
# Running scm-diff-editor as an external binary fixes the issue where
# deletions are not recorded correctly.
#
# Install scm-diff-editor binary:
# cargo install --git https://github.com/arxanas/scm-record.git --features scm-diff-editor
[ui]
# diff-editor = ":builtin"
diff-editor = "scm-diff-editor"
[merge-tools.scm-diff-editor]
program = "/path/to/scm-diff-editor"
edit-args = ["--dir-diff", "$left", "$right"]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment