mirrors/jgit - jgit - source @ dussan.org

Vēsture

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		pirms 9 gadiem
..
MergeAlgorithm.java	Optimize MergeAlgorithm if ours or theirs is empty	pirms 13 gadiem
MergeChunk.java	Fix Javadoc warnings	pirms 14 gadiem
MergeConfig.java	Use branch.<x>.mergeoptions and merge.ff as defaults for merging	pirms 10 gadiem
MergeFormatter.java	Cleanup javadocs so they pass the java8 doclint checks	pirms 10 gadiem
MergeMessageFormatter.java	Add conflicts message before footer	pirms 11 gadiem
MergeResult.java	Fix API errors raised on ResolveMerger affecting API providers only	pirms 9 gadiem
MergeStrategy.java	Add missing @since tags	pirms 11 gadiem
Merger.java	Add a Merger.merge method that makes flushing optional	pirms 9 gadiem
RecursiveMerger.java	Rename local variables/parameters to remove warnings about hiding	pirms 9 gadiem
ResolveMerger.java	ResolveMerger: Use checkoutEntry during abort	pirms 9 gadiem
SquashMessageFormatter.java	Mark non-externalizable strings as such	pirms 11 gadiem
StrategyOneSided.java	Fix exception on conflicts with recursive merge	pirms 10 gadiem
StrategyRecursive.java	Fix @since tags in JGit, version 2.4 never existed	pirms 11 gadiem
StrategyResolve.java	Mark non-externalizable strings as such	pirms 11 gadiem
StrategySimpleTwoWayInCore.java	Mark non-externalizable strings as such	pirms 11 gadiem
ThreeWayMergeStrategy.java	Extend merge support for bare repositories	pirms 13 gadiem
ThreeWayMerger.java	Fix exception on conflicts with recursive merge	pirms 10 gadiem
package-info.java	Add Javadoc description for packages	pirms 11 gadiem