In color-words diffs, hunks are rendered with underline. You can override the
+default style with the following keys:
+# Possible values: "color-words" (default), "git", "summary"
ui.diff.format = "git"
@@ -2482,10 +2570,12 @@ a $):
ui.pager > $PAGER
less -FRX is the default pager in the absence of any other setting, except
on Windows where it is :builtin.
-The special value :builtin enables usage of the
-integrated pager. It is likely if you
-are using a standard Linux distro, your system has $PAGER set already
-and that will be preferred over the built-in. To use the built-in:
+The special value :builtin enables usage of the integrated pager called
+minus. See the docs for the minus
+pager for the key
+bindings and some more details.
+If you are using a standard Linux distro, your system likely already has
+$PAGER set and that will be preferred over the built-in. To use the built-in:
jj config set --user ui.pager :builtin
It is possible the default will change to :builtin for all platforms in the
@@ -2799,6 +2889,9 @@ snapshots without having to rescan the entire working copy.
To configure the Watchman filesystem monitor, set
core.fsmonitor = "watchman". Ensure that you have installed the Watchman
executable on your system.
+You can configure jj to use watchman triggers to automatically create
+snapshots on filestem changes by setting
+core.watchman.register_snapshot_trigger = true.
You can check whether Watchman is enabled and whether it is installed correctly
using jj debug watchman status.
Snapshot settings
diff --git a/latest/conflicts/index.html b/latest/conflicts/index.html
index 16b9e7e34..4e2a24f11 100644
--- a/latest/conflicts/index.html
+++ b/latest/conflicts/index.html
@@ -446,6 +446,26 @@
+
+
+
+
+
+
+
+ Community-built tools
+
+
+
+
+
+
+
+
+
+
+
+
@@ -458,10 +478,10 @@
-
+
-