hgbook

diff en/Makefile @ 100:272146fab009

find changesets by author, revision, files, or words in the commit message
Add yet another illustration of the merge process.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed Oct 18 12:06:56 2006 -0700 (2006-10-18)
parents 06383f9e46e4
children 5b80c922ebdd
line diff
     1.1 --- a/en/Makefile	Mon Oct 16 14:54:37 2006 -0700
     1.2 +++ b/en/Makefile	Wed Oct 18 12:06:56 2006 -0700
     1.3 @@ -22,7 +22,8 @@
     1.4  	mq-stack.svg \
     1.5  	tour-history.svg \
     1.6  	tour-merge-sep-repos.svg \
     1.7 -	tour-merge-pull.svg
     1.8 +	tour-merge-pull.svg \
     1.9 +	tour-merge-merge.svg
    1.10  
    1.11  example-sources := \
    1.12  	daily.files \