log en/examples/rename.divergent.merge.out @ 228:50223e198614

age author description
Sat, 26 May 2007 12:04:52 -0700 Bryan O'Sullivan Update output.
Mon, 16 Apr 2007 14:41:21 -0700 Bryan O'Sullivan Something interesting happened, but I don't have time to look and see.
Mon, 12 Mar 2007 23:11:26 -0700 Bryan O'Sullivan Document merge behaviour with file names.