Re: [Haskell] Data.Generics.gzip3 anyone?

2009-08-08 Thread David Fox
On Sat, Aug 8, 2009 at 4:05 PM, David Fox wrote: > Ok, here is another piece of the three way merging puzzle. The gzip3 > function can do three > way merging when there are no conflicts that need to be resolved manually. > When there are > such conflicts we need a user interface which displays t

Re: [Haskell] Data.Generics.gzip3 anyone?

2009-08-08 Thread David Fox
Ok, here is another piece of the three way merging puzzle. The gzip3 function can do three way merging when there are no conflicts that need to be resolved manually. When there are such conflicts we need a user interface which displays the common ancestor, the two alternative edits, and provides a

[Haskell] Haskell Weekly News: Issue 127 - August 8, 2009

2009-08-08 Thread Brent Yorgey
--- Haskell Weekly News http://sequence.complete.org/hwn/20090808 Issue 127 - August 08, 2009 --- Welcome to issue 127 of HWN, a newsletter covering