[darcs-devel] [issue294] Change handling of conflicts to keep track of auto resolutions

[Eric Kow]

New submission from Eric Kow <eric.kow at gmail.com>:

droundy 2004-11-07
------------------
>From TODO: Change handling of conflicts to keep track of auto resolutions

This is so sequential pulls can't cause trouble in the working directory.

----------
messages: 1071
nosy: EricKow, droundy, tommy
priority: wishlist
status: unread
title: Change handling of conflicts to keep track of auto resolutions
topic: Conflicts, FromRequestTracker

____________________________________
Darcs issue tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue294>
____________________________________