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-18 13:54:20 -08:00
parent eeef7439d3
commit a05ad1440d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Beyond-Compare.md

@ -26,8 +26,8 @@ On Windows, the configuration should be similar but use `/blah` instead of `-bla
```toml
[merge-tools.bc]
program = "bcomp"
edit-args = ["$left", "$right", "/leftreadonly"]
merge-args = ["$left", "$right", "$base", "$output", "/expandall", "/automerge", "/reviewconflicts"]
edit-args = ["$left", "$right", "/leftreadonly", "/expandall"]
merge-args = ["$left", "$right", "$base", "$output", "/automerge", "/reviewconflicts"]
[merge-tools.bc-3]
program = "bcomp"