hgbook
diff en/ch03-concepts.xml @ 674:3b640272a966
Progres on resolve
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Sun Apr 12 00:05:30 2009 -0700 (2009-04-12) |
parents | e9ef075327c1 |
children | 29f0f79cf614 |
line diff
1.1 --- a/en/ch03-concepts.xml Mon Apr 06 23:15:52 2009 -0700 1.2 +++ b/en/ch03-concepts.xml Sun Apr 12 00:05:30 2009 -0700 1.3 @@ -17,7 +17,7 @@ 1.4 <emphasis>efficient</emphasis>. And just as importantly, if it's 1.5 easy for me to retain a good idea of what the software is doing 1.6 when I perform a revision control task, I'm less likely to be 1.7 - surprised by its behaviour.</para> 1.8 + surprised by its behavior.</para> 1.9 1.10 <para id="x_2ea">In this chapter, we'll initially cover the core concepts 1.11 behind Mercurial's design, then continue to discuss some of the 1.12 @@ -444,7 +444,7 @@ 1.13 <command role="hg-cmd">hg commit</command>. In other words, 1.14 this almost never has negative consequences; it's just 1.15 something of a surprise for newcomers. I'll discuss other 1.16 - ways to avoid this behaviour, and why Mercurial behaves in 1.17 + ways to avoid this behavior, and why Mercurial behaves in 1.18 this initially surprising way, later on.</para> 1.19 </note> 1.20