diff en/00book.tex @ 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 6a5864c09879
children 7355af913937
line wrap: on
line diff