Subversion has the nice feature of providing a little bit of context about which hunk is yours and which is from the repository, so you don't have to remember that while you're busy panicking about the conflict. I'm going to see about adding the patch author or name or something to the ends of the vvv and ^^^ lines. No promises, I'm new to Haskell and to darcs.

I'm doing a bit of a hack, you see, to avoid needing a separate repository for a bunch of single-file projects. Instead, I put them all in one repo and make sure to never record a patch which modifies multiple files, and always begin the patch name with the name of the modified file.