Add a test for conflict resolution.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@1496 71dcc9de-d417-0410-9af5-da40c76e7ee4