XCOMMONS-167: Introduce diff/merge API #2
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
first complete implementation
Improve diff result and start to add uni tests
Various improvements and more tests
Move stuff to internal
Add javadoc
* added javadoc * full codestyle * new unified diff TODO: script service
Add script service
ghost
assigned
* Add missing license headers. * Fix checkstyle.
Fix bug introduce in previous refactoring
There was a problem hiding this comment.
typo: "a way merge" should be "a 3-way merge"
Improve genric 3-way merge and get rid of JDiff
Fix Diff/Merge configurations
Rename TYPE enum into Type
tmortagne
added a commit
that referenced
this pull request
May 31, 2012
XCOMMONS-167: Introduce diff/merge API
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.