[darcs-devel] darcs patch: Added mergeFL and mergeFL_FL (and 4 more)

[David Roundy]

Hi Eric,

Here's one more patch, which adds a "cancelled patch" constructor.
I haven't looked closely at the dependencies, so this patch bundle
might not include everything that's actually needed for this.

David

Mon Jun 18 19:50:04 PDT 2007  Jason Dagit <dagit at codersbase.com>
  * Added mergeFL and mergeFL_FL

Wed Jun 20 15:03:35 PDT 2007  Jason Dagit <dagit at codersbase.com>
  * Started fancy_merge

Wed Jul 25 17:20:29 PDT 2007  David Roundy <droundy at darcs.net>
  * fix filenames on conflicted patch.

Wed Jul 25 17:34:22 PDT 2007  David Roundy <droundy at darcs.net>
  * add unused Marked constructor to Patch.

Thu Jul 26 11:02:43 PDT 2007  David Roundy <droundy at darcs.net>
  * add cancelled patch constructor.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: text/x-darcs-patch
Size: 85132 bytes
Desc: A darcs patch for your repository!
Url : http://lists.osuosl.org/pipermail/darcs-devel/attachments/20070726/9cd8b67d/attachment-0001.bin