log hgext/imerge.py @ 5453:9d77f2b47eb7

age author description
Thu, 23 Aug 2007 22:45:41 -0700 Brendan Cully imerge: add automerge flag to attempt to batch merge all conflicts
Thu, 23 Aug 2007 19:51:59 -0700 Brendan Cully imerge: fix ancestor calculation
Mon, 13 Aug 2007 11:58:47 -0700 Brendan Cully imerge: simplify 1d5ebb0d366f
Mon, 13 Aug 2007 19:42:52 +0200 Patrick Mezard imerge: fix status file lookups
Tue, 07 Aug 2007 10:28:43 +0200 Thomas Arendsen Hein Remove trailing spaces, fix indentation
Sat, 04 Aug 2007 12:26:48 -0700 Brendan Cully imerge: gussy up dispatcher to support subcommand opts.
Sat, 04 Aug 2007 09:33:10 -0700 Brendan Cully Merge with crew