Viewing all changes in revision 5106.

Committer: Andrew Bennetts
Date: 2010-11-01 05:52:07 UTC
Revision ID: andrew.bennetts@canonical.com-20101101055207-0prda1olf6bsywgb

More tests, more description of test intent, and specify exactly what happens with duplicate vs. different conflicts.

added added

removed removed