4 ms·
I dunno if you are aware, but you can use the diff/merge standalone. My gift to you: [mergetool "intellij"] cmd = 'intellij-idea-ultimate-edition' me
by sushisource 9mo ago
I dunno if you are aware, but you can use the diff/merge standalone. My gift to you:
[mergetool "intellij"]
cmd = 'intellij-idea-ultimate-edition' merge "$LOCAL" "$REMOTE" "$BASE" "$MERGED"
trustExitCode = true