Mercurial > hgbook
comparison en/ch02-tour-merge.xml @ 775:29f0f79cf614
Update paragraph IDs
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Thu, 16 Apr 2009 23:46:45 -0700 |
| parents | e9ef075327c1 |
| children | a17d6390a480 |
comparison
equal
deleted
inserted
replaced
| 774:e6c99cbd0abd | 775:29f0f79cf614 |
|---|---|
| 162 </imageobject> | 162 </imageobject> |
| 163 <textobject><phrase>XXX add text</phrase></textobject> | 163 <textobject><phrase>XXX add text</phrase></textobject> |
| 164 </mediaobject> | 164 </mediaobject> |
| 165 </figure> | 165 </figure> |
| 166 | 166 |
| 167 <para>We sometimes talk about a merge having | 167 <para id="x_69c">We sometimes talk about a merge having |
| 168 <emphasis>sides</emphasis>: the left side is the first parent | 168 <emphasis>sides</emphasis>: the left side is the first parent |
| 169 in the output of <command role="hg-cmd">hg parents</command>, | 169 in the output of <command role="hg-cmd">hg parents</command>, |
| 170 and the right side is the second. If the working directory | 170 and the right side is the second. If the working directory |
| 171 was at e.g. revision 5 before we began a merge, that revision | 171 was at e.g. revision 5 before we began a merge, that revision |
| 172 will become the left side of the merge.</para> | 172 will become the left side of the merge.</para> |