Updated Issue 209 - support drop/modified conflict (monotone)

Hello,

The following issue has been updated:

209 - support drop/modified conflict
Project: monotone
Status: Started
Reported by: Stephen Leake
URL: https://code.monotone.ca/p/monotone/issues/209/
Labels:
 Type:Incorrect Behavior
 Priority:Medium

Comments (last first):

# By Stephen Leake, Jun  3, 2012:

fixed in branch nvm.issue-209; dropped/modified conflicts are fully supported.

 Status: Started

# By Stephen Leake, May 14, 2012:

Steps to reproduce the problem:
-------------------------------

1. create two heads, one with file_a modified, one with file_a dropped
2. merge

Expected result:
----------------
merge reports a drop/modified conflict

Actual results:
---------------
warning about modifications being lost due to drop

Output of `mtn version --full`:
-------------------------------
1.0



--
Issue: https://code.monotone.ca/p/monotone/issues/209/