comparison en/ch07-branch.xml @ 771:b338f5490029

Americanize spellings :-(
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 09 Apr 2009 22:52:16 -0700
parents 1c13ed2130a7
children e6c99cbd0abd
comparison
equal deleted inserted replaced
770:eb11ec9eed8c 771:b338f5490029
422 of this branch, no matter what the <quote>repo-wide</quote> tip 422 of this branch, no matter what the <quote>repo-wide</quote> tip
423 is. To update to a revision that's on a different named branch, 423 is. To update to a revision that's on a different named branch,
424 you may need to use the <option role="hg-opt-update">-C</option> 424 you may need to use the <option role="hg-opt-update">-C</option>
425 option to <command role="hg-cmd">hg update</command>.</para> 425 option to <command role="hg-cmd">hg update</command>.</para>
426 426
427 <para id="x_39f">This behaviour is a little subtle, so let's see it in 427 <para id="x_39f">This behavior is a little subtle, so let's see it in
428 action. First, let's remind ourselves what branch we're 428 action. First, let's remind ourselves what branch we're
429 currently on, and what branches are in our repository.</para> 429 currently on, and what branches are in our repository.</para>
430 430
431 &interaction.branch-named.parents; 431 &interaction.branch-named.parents;
432 432