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