Mercurial > hgbook
diff en/Makefile @ 156:91a936be78b8
Document merge behaviour with file names.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon, 12 Mar 2007 23:11:26 -0700 |
parents | cf24633b8de7 |
children | e49f4451d0e3 |
line wrap: on
line diff
--- a/en/Makefile Mon Mar 12 23:10:32 2007 -0700 +++ b/en/Makefile Mon Mar 12 23:11:26 2007 -0700 @@ -62,6 +62,7 @@ hook.msglen \ hook.simple \ hook.ws \ + issue29 \ mq.guards \ mq.qinit-help \ mq.dodiff \ @@ -69,6 +70,7 @@ mq.tarball \ mq.tools \ mq.tutorial \ + rename.divergent \ rollback \ template.simple \ template.svnstyle \