[Monotone-devel] Workspace merge status (SoC)

[Zack Weinberg]

My 'ooh shiny!' feature (diff -p) has made it to mainline, and I hope
that the multihead merge heuristic will follow soon.  I've also got a
number of mails to respond to.   I now consider myself sufficiently
familiar with the structure of the code that I can actually tackle the
real project, and will begin on that this week.

zw