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 fb21fb10fc Revert "Fix unchecked conversion warning in MergeFormatter" 9 年之前
..
EolAwareOutputStream.java Optimize EolAwareOutputStream for bulk output 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 Revert "Fix unchecked conversion warning in MergeFormatter" 9 年之前
MergeFormatterPass.java Do not add a newline at the end if neither merged side had one 9 年之前
MergeMessageFormatter.java Silence non-externalized string warnings in org.eclipse.jgit 9 年之前
MergeResult.java Fix API errors raised on ResolveMerger affecting API providers only 10 年之前
MergeStrategy.java Add missing @since tags 11 年之前
Merger.java Delete deprecated Merger.getBaseCommit() 9 年之前
RecursiveMerger.java Use AutoClosable to close resources in bundle org.eclipse.jgit 9 年之前
ResolveMerger.java Use ANY_DIFF filter in ResolveMerger only for bare repositories 9 年之前
SquashMessageFormatter.java Silence non-externalized string warnings in org.eclipse.jgit 9 年之前
StrategyOneSided.java Fix exception on conflicts with recursive merge 10 年之前
StrategyRecursive.java Silence non-externalized string warnings in org.eclipse.jgit 9 年之前
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 年之前