mercurial/help/config.txt
changeset 32910 a7851519ea02
parent 32890 9fcb6df413c9
child 33260 85d1ac011582
--- a/mercurial/help/config.txt	Fri Jun 16 22:57:31 2017 -0700
+++ b/mercurial/help/config.txt	Sun May 28 00:12:38 2017 +0200
@@ -1694,6 +1694,17 @@
     are highly recommended. Partial clones will still be allowed.
     (default: False)
 
+``concurrent-push-mode``
+    Level of allowed race condition between two pushing clients.
+
+    - 'strict': push is abort if another client touched the repository
+      while the push was preparing. (default)
+    - 'check-related': push is only aborted if it affects head that got also
+      affected while the push was preparing.
+
+    This requires compatible client (version 4.3 and later). Old client will
+    use 'strict'.
+
 ``validate``
     Whether to validate the completeness of pushed changesets by
     checking that all new file revisions specified in manifests are