log en/examples/rename.divergent @ 804:83540574ee49

age author description
Sun, 12 Apr 2009 00:05:30 -0700 Bryan O'Sullivan Progres on resolve
Mon, 12 Mar 2007 23:11:26 -0700 Bryan O'Sullivan Document merge behaviour with file names.