hgbook

diff en/examples/tour.status.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
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/en/examples/tour.status.out	Mon Mar 12 23:11:26 2007 -0700
     1.3 @@ -0,0 +1,4 @@
     1.4 +$ \textbf{ls}
     1.5 +Makefile  hello.c
     1.6 +$ \textbf{hg status}
     1.7 +M hello.c