git.iko.soy/urbit.org
on master help sign in
typos, minor change in wording
10a1e3fdrbeefsupreme
arvo/clay/using.md+4−4
compare with master
unifiedsplit
@@ -81,9 +81,9 @@ be automatically committed with `|autocommit %mount-point`.
81
81
82Usage:
82Usage:
83```
83```
84−|merge %destination-`desk` ~source-ship %source-`desk`
84+|merge %target-desk ~source-ship %source-desk
85−|merge %destination-`desk` ~source-ship %source-`desk`, =gem %strategy
85+|merge %target-desk ~source-ship %source-desk, =gem %strategy
86−|merge %destination-`desk` ~source-ship %source-`desk`, =cas ud+5
86+|merge %target-desk ~source-ship %source-desk, =cas ud+5
87```
87```
88
88
89Clay supports various merge strategies. A "commit" is a snapshot of
89Clay supports various merge strategies. A "commit" is a snapshot of
@@ -198,7 +198,7 @@ the `desk`s to not conflict with.
198
198
199Usage:
199Usage:
200```
200```
201−|sync destination-desk ~source-ship source-desk
201+|sync %target-desk ~source-ship %source-desk
202```
202```
203
203
204Tracking and staying in sync with another `desk` is another
204Tracking and staying in sync with another `desk` is another