martinvonz/jj
1
1
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2024-11-27 12:06:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Created Beyond Compare (markdown)

Ilya Grigoriev 2023-12-17 19:19:33 -08:00
parent 239aae91de
commit fe036d94fd
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Beyond-Compare.md Normal file

@ -0,0 +1,21 @@
Beyond compare is neither free as in freedom nor free as in beer. Only the "Pro" edition seems usable for version control.
They do have a generous free trial. It's "30 days", but this only counts the days you actively used the program.
Here are some decent configs for Linux.
```toml
[merge-tools.bc]
program = "bcompare" # On MacOS, this should be "bcomp".
edit-args = ["$left", "$right", "-ro1"]
merge-args = ["$left", "$right", "$base", "$output", "-automerge", "-reviewconflicts"]
[merge-tools.bc-3]
# Alternative config similar to `meld-3`. See
# https://martinvonz.github.io/jj/stable/config/#experimental-3-pane-diff-editing
program="bcompare" # On MacOS, this should be "bcomp".
edit-args = ["$left", "$right", "-mergeoutput=$output", "-ro1", "-ro2"]
# Optionally, can copy `merge-args` from the above example
```
For MacOS, see the comment: you need to use `bcomp` instead of `bcompare`. I have not tried this on Windows, you will likely need to enter the full path to `BComp.exe`, and you *might* need to change `-blah` options to `/blah`.