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

Updated Beyond Compare (markdown)

Ilya Grigoriev 2023-12-17 19:23:35 -08:00
parent cd4b9f3795
commit 17ffddc549
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Beyond-Compare.md

@ -18,4 +18,6 @@ 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`.
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`.