From 3c07d10c5bfc47e5f789d757f037d0ab25409312 Mon Sep 17 00:00:00 2001 From: Matt Kulukundis Date: Wed, 3 Jul 2024 20:13:14 -0400 Subject: [PATCH] fix: fix change notes to move something from 0.19 to future --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c05e96b038..f3d256d476 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ### New features +* External diff tools can now be configured to invoke the tool on each file + individually instead of being passed a directory by setting + `merge-tools.$TOOL.diff-invocation-mode="file-by-file"` in config.toml. + ### Fixed bugs ## [0.19.0] - 2024-07-03 @@ -98,10 +102,6 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). * `jj squash` now accepts a `--keep-emptied` option to keep the source commit. -* External diff tools can now be configured to invoke the tool on each file - individually instead of being passed a directory by setting - `merge-tools.$TOOL.diff-invocation-mode="file-by-file"` in config.toml. - ### Fixed bugs * `jj git push` now ignores immutable commits when checking whether a