From e93e44a2517e1647f7963bf76acc5e0e0ea5cebb Mon Sep 17 00:00:00 2001
From: Essien Ita Essien <34972+essiene@users.noreply.github.com>
Date: Wed, 25 Sep 2024 08:52:29 +0100
Subject: [PATCH] changelog: `conflict()` and `file()` deprecations are yet
 unreleased.

Move this update under `Unreleased`. I started the change before the last
release and after rebasing, forgot to move it. Fixing it now thanks to @yuja
catching this on time.

Issue: #4122
---
 CHANGELOG.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c26b833e8..1582035b53 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 * The `git.push-branch-prefix` config has been deprecated in favor of
   `git.push-bookmark-prefix`.
 
+* `conflict()` and `file()` revsets have been renamed to `conflicts()` and `files()`
+  respectively. The old names are still around and will be removed in a future
+  release.
+
 ### New features
 
 * The new config option `snapshot.auto-track` lets you automatically track only
@@ -94,10 +98,6 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
   commit to commit. It now either follows the flags `--edit|--no-edit` or it
   gets the mode from `ui.movement.edit`.
 
-* `conflict()` and `file()` revsets have been renamed to `conflicts()` and `files()`
-  respectively. With this, all revsets that could potentially return multiple
-  results are named in the plural.
-
 ### Deprecations
 
 * `jj untrack` has been renamed to `jj file untrack`.