docs/src/push.md

changeset 282
3070d72f54af
parent 273
c743721d566f
child 283
0e36bb75a732
--- a/docs/src/push.md	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/src/push.md	Sat Aug 05 13:35:27 2017 +0200
@@ -7,8 +7,9 @@
 
 If conflict detection is not disabled, all files that are also modified on the server will be skipped.
 
-**`-c`** Disable conflict detection. This always overrides files on the server
+**`-c`** Disable conflict detection. This always overwrites files on the server
 
 **`-l`** Lock the repository before accessing it. After `push` completed, the repository is unlocked
 
-**`-d`** Don't lock the repository
+**`-d`** Don't lock the repository (default)
+

mercurial