From eeef7439d33d174257db7e2203647ad008259786 Mon Sep 17 00:00:00 2001 From: Stephen Jennings Date: Mon, 18 Dec 2023 08:53:38 -0800 Subject: [PATCH] Add Windows config and fix link to 3 pane diff documentation --- Beyond-Compare.md | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Beyond-Compare.md b/Beyond-Compare.md index 26d4662..3447d0c 100644 --- a/Beyond-Compare.md +++ b/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`. \ No newline at end of file +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"] +``` \ No newline at end of file