hgbook

diff en/tour-merge.tex @ 254:7301e64c362e

find changesets by author, revision, files, or words in the commit message
Chris Mason's "rej" tool has been superseded by "mpatch", per David Rushby.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed May 30 22:18:04 2007 -0700 (2007-05-30)
parents 5b80c922ebdd
children d9d29e7cf5bd
line diff
     1.1 --- a/en/tour-merge.tex	Thu Oct 19 15:18:07 2006 -0700
     1.2 +++ b/en/tour-merge.tex	Wed May 30 22:18:04 2007 -0700
     1.3 @@ -231,8 +231,8 @@
     1.4  of our merge:
     1.5  \interaction{tour-merge-conflict.commit}
     1.6  
     1.7 -\section{Simplifying the pull-merge-commit 
     1.8 -  sequence}
     1.9 +\section{Simplifying the pull-merge-commit sequence}
    1.10 +\label{sec:tour-merge:fetch}
    1.11  
    1.12  The process of merging changes as outlined above is straightforward,
    1.13  but requires running three commands in sequence.