I’d like to use Sublime Merge with Jujutsu as a 3-way merge tool for conflict resolution.
See https://jj-vcs.github.io/jj/latest/config/#3-way-merge-tools-for-conflict-resolution and https://www.sublimemerge.com/docs/command_line
I tried:
conflict-marker-style = "git" # https://jj-vcs.github.io/jj/latest/conflicts/#alternative-conflict-marker-styles
merge-editor = ["smerge", "$base", "$left", "$right", "-o", "$output"]
but got
Error: Failed to resolve conflicts
Caused by: Tool exited with exit status: 1
Conflict I tried to resolve with jj resolve:
<<<<<<< Side #1 (Conflict 1 of 1)
Test conflict 1qq
Test conflict 2qq
||||||| Base
test 2
test 3
test 4
=======
Test conflict 1mm
Test conflict 2mm
>>>>>>> Side #2 (Conflict 1 of 1 ends)