log mercurial/merge.py @ 4398:9fe267f77f56

age author description
Thu, 03 May 2007 17:24:43 -0500 Matt Mackall merge: fix a bug detecting directory moves