# HG changeset patch # User Yuya Nishihara # Date 1716707093 -32400 # Sun May 26 16:04:53 2024 +0900 # Node ID fcfdc167569c825e3b405f9d3d90a0b3719b0d57 # Parent 225192df7627606fc49a334f8bc7a993e5665797 jj: revert default diff format to color-words Two-pane difft output is nice, but it requires wider terminal screen. Inline difft is a bit confusing because middle context lines are omitted. diff --git a/dot.jjconfig.toml b/dot.jjconfig.toml --- a/dot.jjconfig.toml +++ b/dot.jjconfig.toml @@ -25,7 +25,6 @@ [ui] allow-filesets = true -diff.tool = "difft" merge-editor = "kdiff3" pager = ["less", "-RSX"]