log mercurial/merge.py @ 2824:ca06d35af65e

age author description
Mon, 07 Aug 2006 23:53:04 -0500 Matt Mackall Rename merge.allow -> merge.branchmerge
Mon, 07 Aug 2006 16:47:06 -0500 Matt Mackall Merge with crew
Thu, 03 Aug 2006 15:24:41 -0500 Matt Mackall Move merge code to its own module