# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1716609546 -32400
#      Sat May 25 12:59:06 2024 +0900
# Node ID 44a2572fdcd3207b60dae4921910cb043b63b516
# Parent  e3f311dd4ee2f4bf0bf7c5f2a27c9fc6b6a46994
jj: add inline difft

diff --git a/dot.jjconfig.toml b/dot.jjconfig.toml
--- a/dot.jjconfig.toml
+++ b/dot.jjconfig.toml
@@ -37,6 +37,11 @@
 diff-args = ["--color=always", "--display=side-by-side-show-both", "--sort-paths",
              "--", "$left", "$right"]
 
+[merge-tools.difft-inline]
+program = "difft"
+diff-args = ["--color=always", "--display=inline", "--sort-paths",
+             "--", "$left", "$right"]
+
 [merge-tools.emacs-ztree]
 program = "emacsclient"
 diff-args = ["-c", "--eval", '(ztree-diff "$left" "$right")']