add attribute <expectConflicts> and pass it to cup by "-expect"
Merge pull request #1 from stepinto/expect-conflicts-1223

add attribute <expectConflicts> and pass it to cup by "-expect"