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