hgbook

annotate en/examples/backout.manual.cat.out @ 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
children e0b56f008b09
rev   line source
bos@144 1 $ \textbf{cat myfile}
bos@144 2 first change