Added subsection on merging.
commit30a926c3da3347549e8aca3bd8890043a476059a
authorBen Lynn <benlynn@gmail.com>
Mon, 8 Mar 2010 08:44:45 +0000 (8 00:44 -0800)
committerBen Lynn <benlynn@gmail.com>
Mon, 8 Mar 2010 08:44:45 +0000 (8 00:44 -0800)
treed09e116d2d6be5a3e93de52b897fc2ce66eb7c8d
parent14849b8e40f018f58434c12380ff9a66774970e8
Added subsection on merging.

Other edits.
en/branch.txt
en/secrets.txt