Added subsection on merging.
[gitmagic.git] / en / 
tree052ec997cbb059a144dffae6b6587d2f8befd0e9
drwxr-xr-x   ..
-rw-r--r-- 7198 basic.txt
-rw-r--r-- 11220 branch.txt
-rw-r--r-- 8474 clone.txt
-rw-r--r-- 6891 drawbacks.txt
-rw-r--r-- 10300 grandmaster.txt
-rw-r--r-- 9663 history.txt
-rw-r--r-- 6380 intro.txt
-rw-r--r-- 8691 multiplayer.txt
-rw-r--r-- 3138 preface.txt
-rw-r--r-- 11509 secrets.txt
-rw-r--r-- 1424 translate.txt