Mercurial > hgbook

diff en/ch03-tour-merge.xml @ 671:13513d2a128d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add sensible names to chapters.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 09 Mar 2009 23:37:29 -0700
parents 8fcd44708f41
children 80928ea6e7ae cfdb601a3c8b
line wrap: on
line diff
--- a/en/ch03-tour-merge.xml	Mon Mar 09 23:37:19 2009 -0700
+++ b/en/ch03-tour-merge.xml	Mon Mar 09 23:37:29 2009 -0700
@@ -1,6 +1,7 @@
 <!-- vim: set filetype=docbkxml shiftwidth=2 autoindent expandtab tw=77 : -->
 
 <chapter id="chap:tour-merge">
+  <?dbhtml filename="a-tour-of-mercurial-merging-work.html"?>
   <title>A tour of Mercurial: merging work</title>
 
   <para>We've now covered cloning a repository, making changes in a