diff en/ch04-concepts.tex @ 650:f72b7e6cbe90

Snapshot.

--- a/en/ch04-concepts.tex	Thu Jan 29 22:56:27 2009 -0800
+++ b/en/ch04-concepts.tex	Thu Feb 05 00:01:16 2009 -0800
@@ -39,8 +39,7 @@
 \begin{figure}[ht]
   \centering
   \grafix{filelog}
-  \caption{Relationships between files in working directory and
-    filelogs in repository}
+  \caption{Relationships between files in working directory and filelogs in repository}
   \label{fig:concepts:filelog}
 \end{figure}
 
@@ -205,8 +204,7 @@
 after the corrupted section.  This would not be possible with a
 delta-only storage model.
 
-\section{Revision history, branching,
-  and merging}
+\section{Revision history, branching, and merging}
 
 Every entry in a Mercurial revlog knows the identity of its immediate
 ancestor revision, usually referred to as its \emph{parent}.  In fact,
@@ -265,8 +263,7 @@
 \subsection{What happens when you commit}
 
 The dirstate stores parent information for more than just book-keeping
-purposes.  Mercurial uses the parents of the dirstate as \emph{the
-  parents of a new changeset} when you perform a commit.
+purposes.  Mercurial uses the parents of the dirstate as \emph{the parents of a new changeset} when you perform a commit.
 
 \begin{figure}[ht]
   \centering