mirrors/jgit - jgit - source @ dussan.org

Verlauf

Shawn Pearce 3886a4f68b ResolveMerger: Use checkoutEntry during abort The cleanUp path is trying to restore files that previously were clean, but were overwritten in the work tree by a partial merge attempt that has failed and needs to be aborted. Reuse the checkout logic to write the file content and refresh the stat data. Change-Id: I320d33b3744daf88d3155db99e957408937ddd00		vor 9 Jahren
..
MergeAlgorithm.java	Optimize MergeAlgorithm if ours or theirs is empty	vor 13 Jahren
MergeChunk.java	Fix Javadoc warnings	vor 14 Jahren
MergeConfig.java	Use branch.<x>.mergeoptions and merge.ff as defaults for merging	vor 10 Jahren
MergeFormatter.java	Cleanup javadocs so they pass the java8 doclint checks	vor 10 Jahren
MergeMessageFormatter.java	Add conflicts message before footer	vor 11 Jahren
MergeResult.java	Fix API errors raised on ResolveMerger affecting API providers only	vor 9 Jahren
MergeStrategy.java	Add missing @since tags	vor 11 Jahren
Merger.java	Add a Merger.merge method that makes flushing optional	vor 9 Jahren
RecursiveMerger.java	Rename local variables/parameters to remove warnings about hiding	vor 9 Jahren
ResolveMerger.java	ResolveMerger: Use checkoutEntry during abort	vor 9 Jahren
SquashMessageFormatter.java	Mark non-externalizable strings as such	vor 11 Jahren
StrategyOneSided.java	Fix exception on conflicts with recursive merge	vor 10 Jahren
StrategyRecursive.java	Fix @since tags in JGit, version 2.4 never existed	vor 11 Jahren
StrategyResolve.java	Mark non-externalizable strings as such	vor 11 Jahren
StrategySimpleTwoWayInCore.java	Mark non-externalizable strings as such	vor 11 Jahren
ThreeWayMergeStrategy.java	Extend merge support for bare repositories	vor 13 Jahren
ThreeWayMerger.java	Fix exception on conflicts with recursive merge	vor 10 Jahren
package-info.java	Add Javadoc description for packages	vor 11 Jahren