martinvonz/jj
1
1
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2024-11-30 13:32:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add Windows config and fix link to 3 pane diff documentation

Stephen Jennings 2023-12-18 08:53:38 -08:00
parent 75c7fd7217
commit eeef7439d3
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Beyond-Compare.md

@ -2,7 +2,7 @@
They do have a generous free trial. It's "30 days", but this only counts the days you actively use the program.
Beyond Compare can substitute for `meld` for [3-pane diff editing](https://martinvonz.github.io/jj/stable/config/#experimental-3-pane-diff-editing). This is helpful for recent MacOS versions, where `meld` does not currently work well.
Beyond Compare can substitute for `meld` for [3-pane diff editing](https://martinvonz.github.io/jj/latest/config/#experimental-3-pane-diff-editing). This is helpful for recent MacOS versions, where `meld` does not currently work well.
Here are some decent configs for Linux.
@ -21,4 +21,15 @@ edit-args = ["$left", "$right", "-expandall", "-mergeoutput=$right", "-ro1", "-
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`.
On Windows, the configuration should be similar but use `/blah` instead of `-blah` for options:
```toml
[merge-tools.bc]
program = "bcomp"
edit-args = ["$left", "$right", "/leftreadonly"]
merge-args = ["$left", "$right", "$base", "$output", "/expandall", "/automerge", "/reviewconflicts"]
[merge-tools.bc-3]
program = "bcomp"
edit-args = ["$left", "$right", "/expandall", "/mergeoutput=$right", "/leftreadonly", "/rightreadonly"]
```