From 36cd921a0e4cc8d0c8fa69e9891790da1516b862 Mon Sep 17 00:00:00 2001 From: Ilya Grigoriev Date: Mon, 30 Sep 2024 13:53:39 -0700 Subject: [PATCH] README.md: Update note about `jj resolve` --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9d41eef..cb7e6b7 100644 --- a/README.md +++ b/README.md @@ -75,8 +75,9 @@ jj split --tool diffedit3 You can make `diffedit3` the default diff editing tool by setting `ui.diff-editor="diffedit3"` in your [`jj` config] ([additional docs]). -Using `diffedit3` as a merge tool with `jj resolve` is not currently -recommended. (TODO: hopefully, this will change shortly). +Using `diffedit3` as a merge tool with `jj resolve` is possible since version +0.5.0, but requires configuration and is not currently convenient or +recommended. (TODO: hopefully, this will improve shortly). If you'd like to adjust the config or use `diffedit3` with older versions of `jj`, you can adapt `jj`'s default TOML config for `diffedit3` from its