comparison 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
comparison
equal deleted inserted replaced
155:914babdc99c8 156:91a936be78b8
60 daily.revert \ 60 daily.revert \
61 filenames \ 61 filenames \
62 hook.msglen \ 62 hook.msglen \
63 hook.simple \ 63 hook.simple \
64 hook.ws \ 64 hook.ws \
65 issue29 \
65 mq.guards \ 66 mq.guards \
66 mq.qinit-help \ 67 mq.qinit-help \
67 mq.dodiff \ 68 mq.dodiff \
68 mq.id \ 69 mq.id \
69 mq.tarball \ 70 mq.tarball \
70 mq.tools \ 71 mq.tools \
71 mq.tutorial \ 72 mq.tutorial \
73 rename.divergent \
72 rollback \ 74 rollback \
73 template.simple \ 75 template.simple \
74 template.svnstyle \ 76 template.svnstyle \
75 tour \ 77 tour \
76 tour-merge-conflict 78 tour-merge-conflict