Mercurial > hgrepos > Python > libs > ConfigMix

diff docs/introduction.rst @ 276:af371f9c016d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow deletion of key-value pairs when merging is done. When encountering the "{{::DEL::}}" special value the corresponding key-value pair is deleted.
author Franz Glasner <fzglas.hg@dom66.de>
date Sat, 03 Oct 2020 17:11:41 +0200
parents 57ff12610dc5
children da1596034954
line wrap: on
line diff
--- a/docs/introduction.rst	Sat Oct 03 15:52:30 2020 +0200
+++ b/docs/introduction.rst	Sat Oct 03 17:11:41 2020 +0200
@@ -227,6 +227,15 @@
 ``[namespace:]variable``.
 
 
+.. _merging-deletions:
+
+Deletions
+---------
+
+By using the special value ``{{::DEL::}}`` the corresponding key-value
+pair is deleted when merging is done.
+
+
 .. _comments:
 
 Comments