log en/examples/rename.divergent.merge.out @ 156:91a936be78b8

age author description
Mon, 12 Mar 2007 23:11:26 -0700 Bryan O'Sullivan Document merge behaviour with file names.