Initial commit
Initialize project
Configure sonar
Update README.md with build status link
Add commons-io dependency
Add m2e lifecycle exclusion
Rename package
Add utility to manipulate files
Add conflicts and respective detection
Add conflict detector for file system changes
Add two versions of a file system structures for testing
Add hamcrest dependency
Implement basic file system conflict detection
Replace source code mockup test case
Gather relevant source code files
Break package dependency cycle
Change sonar analysis mode
Add args4j and log4j dependencies

Also add configuration for log4j
Add mockito and powermock dependencies
Build application runner