Mercurial > hgbook

diff en/Makefile @ 100:272146fab009

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add yet another illustration of the merge process.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 18 Oct 2006 12:06:56 -0700
parents 06383f9e46e4
children 5b80c922ebdd
line wrap: on
line diff
--- a/en/Makefile	Mon Oct 16 14:54:37 2006 -0700
+++ b/en/Makefile	Wed Oct 18 12:06:56 2006 -0700
@@ -22,7 +22,8 @@
 	mq-stack.svg \
 	tour-history.svg \
 	tour-merge-sep-repos.svg \
-	tour-merge-pull.svg
+	tour-merge-pull.svg \
+	tour-merge-merge.svg
 
 example-sources := \
 	daily.files \