log mercurial/merge.py @ 3233:3fd098e0902d

age author description
Mon, 02 Oct 2006 12:04:48 -0500 Matt Mackall merge: extend file merge function for renames