log

age author description
Thu, 03 Aug 2006 15:24:41 -0500 Matt Mackall Move merge code to its own module
Thu, 03 Aug 2006 13:07:57 -0500 Matt Mackall Add a doc string
Mon, 07 Aug 2006 19:08:55 -0700 Vadim Gelfer fetch: add missing import.