log mercurial/merge.py @ 4399:3b7e284b8f28

age author description
Thu, 03 May 2007 17:24:43 -0500 Matt Mackall merge: expand and simplify the invalid handling for directory moves
Thu, 03 May 2007 17:24:43 -0500 Matt Mackall merge: fix a bug detecting directory moves
Thu, 03 May 2007 17:24:43 -0500 Matt Mackall merge: clarify the findcopies code
Mon, 16 Apr 2007 12:37:30 -0500 Matt Mackall Merge with stable
Mon, 16 Apr 2007 12:24:52 -0500 Matt Mackall merge: fix quadratic behavior in find-copies
Thu, 05 Apr 2007 17:09:31 -0500 Matt Mackall Merge with stable
Thu, 05 Apr 2007 16:43:18 -0500 Matt Mackall merge: fix a bug where copies were ignored