log mercurial/merge.py @ 2911:95cc73523983

age author description
Tue, 15 Aug 2006 15:45:45 -0500 Matt Mackall Use revlog hash comparison technique in merge
Mon, 14 Aug 2006 14:42:15 -0500 Matt Mackall Merge with crew
Mon, 14 Aug 2006 14:14:08 -0500 Matt Mackall merge: minor simplification