Changes

Summary

Support creating Mergers without a Repository (details)

Commit 4c3e274588060d9ab2e05d7919f506789bcbbc0b by Jonathan Nieder Support creating Mergers without a Repository All that's really required to run a merge operation is a single ObjectInserter, from which we can construct a RevWalk, plus a Config that declares a diff algorithm. Provide some factory methods that don't take Repository. Change-Id: Ib884dce2528424b5bcbbbbfc043baec1886b9bbd
The file was modified	org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java
The file was modified	org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java
The file was modified	org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java
The file was modified	org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
The file was modified	org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeStrategy.java
The file was modified	org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategySimpleTwoWayInCore.java
The file was modified	org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
The file was modified	org.eclipse.jgit/src/org/eclipse/jgit/merge/ThreeWayMerger.java
The file was modified	org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
The file was modified	org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/SimpleMergeTest.java
The file was modified	org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyOneSided.java
The file was modified	org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyRecursive.java
The file was modified	org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyResolve.java