sign: Update CHANGELOG

jj-vcs · Mar 9, 2024 · 64828b8 · 64828b8
1 parent c6dcf93
commit 64828b8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * `ui.default-command` now accepts multiple string arguments, for more complex
   default `jj` commands.
 
++ Add templater support for rendering commit signatures and updated default
+  templates.
+
 ### Fixed bugs
 
 ## [0.15.1] - 2024-03-06

diff --git a/docs/config.md b/docs/config.md
@@ -522,8 +522,6 @@ the conflict is done, `jj` assumes that the conflict was only partially resolved
 and parses the conflict markers to get the new state of the conflict. The
 conflict is considered fully resolved when there are no conflict markers left.
 
-<<<<<<<
-+++++++
 ## Commit Signing
 
 `jj` can be configured to sign and verify the commits it creates using either