957419610a
* changes: ResolveMerger: do not content-merge gitlinks on del/mod conflicts ResolveMerger: Adding test cases for GITLINK deletion ResolveMerger: choose OURS on gitlink when ignoreConflicts ResolveMerger: improving content merge readability ResolveMerger: extracting createGitLinksMergeResult method ResolveMerger: Adding test cases for GITLINK merge |
||
---|---|---|
.. | ||
.settings | ||
META-INF | ||
src/org/eclipse/jgit/junit | ||
.classpath | ||
.gitignore | ||
.project | ||
BUILD | ||
build.properties | ||
plugin.properties | ||
pom.xml |