The help for `darcs mark-conflicts` says that if you have unrecorded changes, 
then they will become lost and that darcs will prompt before overwriting them.

I was wondering: this could be easily avoided simply by regarding unrecorded 
changes as potential conflict resolutions "under construction". In other 
words: we calculate the markup under the /assumption/ that unrecorded changes 
are eventually recorded. Technically, this simply means that we include the 
(temporary) named patch that contains the unrecorded changes when calling 
resolveConflicts. That should make it impossible for markup created by mark-
conflicts to conflict with unrecorded changes.

see patch2355