Author: markh Date: Thu Jun 28 09:18:30 2007 New Revision: 551611 URL: http://svn.apache.org/viewvc?view=rev&rev=551611 Log: [MNG-612] implement conflict resolution techniques
Branched 2.0.x to fix issue.
Added:
maven/components/branches/MNG-612/
- copied from r551610, maven/components/branches/maven-2.0.x/
