log mercurial/merge.py @ 2898:06c05c675a35

age author description
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