From c0c33517e332b2e9feafbed0c7ac88e0476fc7bf Mon Sep 17 00:00:00 2001 From: Abdul-Rahman Sibahi Date: Tue, 17 Jun 2025 08:51:04 +0300 Subject: [PATCH 1/3] Update jj.md old setting was deprecated. this setting worked for me --- manual/src/jj.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manual/src/jj.md b/manual/src/jj.md index a9011ad00..b48b83dab 100644 --- a/manual/src/jj.md +++ b/manual/src/jj.md @@ -9,7 +9,7 @@ file](https://jj-vcs.github.io/jj/v0.26.0/config/#user-config-file). ```toml [ui] -diff.tool = ["difft", "--color=always", "$left", "$right"] +diff-formatter = ["difft", "--color=always", "$left", "$right"] ``` From ef890856c1ded9b7d4e63a6a4dd6eedfda84d60f Mon Sep 17 00:00:00 2001 From: Abdul-Rahman Sibahi Date: Tue, 17 Jun 2025 13:18:47 +0300 Subject: [PATCH 2/3] Correct jj links --- manual/src/jj.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manual/src/jj.md b/manual/src/jj.md index b48b83dab..585641cf1 100644 --- a/manual/src/jj.md +++ b/manual/src/jj.md @@ -1,11 +1,11 @@ # Jujutsu Jujutsu supports [external diff -commands](https://jj-vcs.github.io/jj/v0.26.0/config/#generating-diffs-by-external-command). +commands](https://jj-vcs.github.io/jj/latest/config/#generating-diffs-by-external-command). To use difftastic for diffing in jujutsu, add the following to your [user configuration -file](https://jj-vcs.github.io/jj/v0.26.0/config/#user-config-file). +file](https://jj-vcs.github.io/jj/latest/config/#user-config-files). ```toml [ui] From 0a24f131a17b86d5d49ab14ca7ddeae15370f917 Mon Sep 17 00:00:00 2001 From: Abdul-Rahman Sibahi Date: Tue, 17 Jun 2025 13:20:03 +0300 Subject: [PATCH 3/3] add jj link --- manual/src/usage.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manual/src/usage.md b/manual/src/usage.md index 769173d0d..fb30ba9a6 100644 --- a/manual/src/usage.md +++ b/manual/src/usage.md @@ -1,8 +1,8 @@ # Usage This page describes how to use the `difft` binary directly. See also -the [Git](./git.html), [Mercurial](./mercurial.html) and -[Fossil](./fossil.html) pages for instructions on how to configure +the [Git](./git.html), [Mercurial](./mercurial.html), +[Fossil](./fossil.html), or [Jujutsu](./jj.html) pages for instructions on how to configure them to use difftastic. ## File Arguments