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
Sat, 12 Aug 2006 16:40:12 -0700 Vadim Gelfer remove localrepository.changes.
Wed, 09 Aug 2006 22:07:13 -0500 Matt Mackall Merge: use single objects for tracking manifests
Wed, 09 Aug 2006 17:11:01 -0500 Matt Mackall Merge: save away mode bit so that we don't need manifest later
Wed, 09 Aug 2006 15:03:46 -0500 Matt Mackall Merge manifest refactor work