Java Diff/Merge tool is a utility used to provide information and automatic resolution for merge conflicts on Java files.
This project is under active development but is not ready to be used yet...
Use only this tool to perform merges in our production environment
- Initial commit
- ...
Help for this project is more than welcomed, so feel free to create an issue or to send a pull request.
The Java Diff/Merge tool is licensed under the MIT License (see the LICENSE file)
This project was made possible thanks to several Open Source Projects :
- JavaParser : a tool converting Java Source files into Abstract Syntax Trees