You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Shawn Pearce 3886a4f68b ResolveMerger: Use checkoutEntry during abort 9 anni fa
..
MergeAlgorithm.java Optimize MergeAlgorithm if ours or theirs is empty 13 anni fa
MergeChunk.java Fix Javadoc warnings 14 anni fa
MergeConfig.java Use branch.<x>.mergeoptions and merge.ff as defaults for merging 10 anni fa
MergeFormatter.java Cleanup javadocs so they pass the java8 doclint checks 10 anni fa
MergeMessageFormatter.java Add conflicts message before footer 11 anni fa
MergeResult.java Fix API errors raised on ResolveMerger affecting API providers only 9 anni fa
MergeStrategy.java Add missing @since tags 11 anni fa
Merger.java Add a Merger.merge method that makes flushing optional 9 anni fa
RecursiveMerger.java Rename local variables/parameters to remove warnings about hiding 9 anni fa
ResolveMerger.java ResolveMerger: Use checkoutEntry during abort 9 anni fa
SquashMessageFormatter.java Mark non-externalizable strings as such 11 anni fa
StrategyOneSided.java Fix exception on conflicts with recursive merge 10 anni fa
StrategyRecursive.java Fix @since tags in JGit, version 2.4 never existed 11 anni fa
StrategyResolve.java Mark non-externalizable strings as such 11 anni fa
StrategySimpleTwoWayInCore.java Mark non-externalizable strings as such 11 anni fa
ThreeWayMergeStrategy.java Extend merge support for bare repositories 13 anni fa
ThreeWayMerger.java Fix exception on conflicts with recursive merge 10 anni fa
package-info.java Add Javadoc description for packages 11 anni fa