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