diff --git a/cli/src/config/merge_tools.toml b/cli/src/config/merge_tools.toml
index 0e5038e0ff..f560053a62 100644
--- a/cli/src/config/merge_tools.toml
+++ b/cli/src/config/merge_tools.toml
@@ -44,6 +44,7 @@ merge-tool-edits-conflict-markers = true
 # https://gist.github.com/ilyagr/5d6339fb7dac5e7ab06fe1561ec62d45
 edit-args = ["-f", "-d", "$left", "$right"]
 
+# if you change the settings for vscode, please do the same for vscodium
 [merge-tools.vscode]
 program = "code"
 merge-args = ["--wait", "--merge", "$left", "$right", "$base", "$output"]
@@ -51,3 +52,10 @@ merge-args = ["--wait", "--merge", "$left", "$right", "$base", "$output"]
 # markers. Unfortunately, it does not seem to be able to output conflict markers when
 # the user only resolves some of the conflicts.
 merge-tool-edits-conflict-markers = true
+
+# free/libre distribution of vscode, functionally more or less the same
+[merge-tools.vscodium]
+program = "codium"
+merge-args = ["--wait", "--merge", "$left", "$right", "$base", "$output"]
+merge-tool-edits-conflict-markers = true
+
diff --git a/docs/config.md b/docs/config.md
index c0906b116b..79adf6248e 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -621,12 +621,12 @@ by `jj resolve`. For example:
 
 ```toml
 # Use merge-tools.meld.merge-args
-ui.merge-editor = "meld"  # Or "vscode" or "kdiff3" or "vimdiff"
+ui.merge-editor = "meld"  # Or "vscode" or "vscodium" or "kdiff3" or "vimdiff"
 # Specify merge-args inline
 ui.merge-editor = ["meld", "$left", "$base", "$right", "-o", "$output"]
 ```
 
-The "vscode", "meld", "kdiff3", and "vimdiff" tools can be used out of the box,
+The "vscode", "vscodium", "meld", "kdiff3", and "vimdiff" tools can be used out of the box,
 as long as they are installed.
 
 Using VS Code as a merge tool works well with VS Code's [Remote