hgbook

diff en/Makefile @ 156:91a936be78b8

Document merge behaviour with file names.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon Mar 12 23:11:26 2007 -0700 (2007-03-12)
parents cf24633b8de7
children e49f4451d0e3
line diff
     1.1 --- a/en/Makefile	Mon Mar 12 21:10:19 2007 -0700
     1.2 +++ b/en/Makefile	Mon Mar 12 23:11:26 2007 -0700
     1.3 @@ -62,6 +62,7 @@
     1.4  	hook.msglen \
     1.5  	hook.simple \
     1.6  	hook.ws \
     1.7 +	issue29 \
     1.8  	mq.guards \
     1.9  	mq.qinit-help \
    1.10  	mq.dodiff \
    1.11 @@ -69,6 +70,7 @@
    1.12  	mq.tarball \
    1.13  	mq.tools \
    1.14  	mq.tutorial \
    1.15 +	rename.divergent \
    1.16  	rollback \
    1.17  	template.simple \
    1.18  	template.svnstyle \