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" hace 9 años
..
EolAwareOutputStream.java Optimize EolAwareOutputStream for bulk output hace 9 años
MergeAlgorithm.java Optimize MergeAlgorithm if ours or theirs is empty hace 13 años
MergeChunk.java Fix Javadoc warnings hace 14 años
MergeConfig.java Use branch.<x>.mergeoptions and merge.ff as defaults for merging hace 10 años
MergeFormatter.java Revert "Fix unchecked conversion warning in MergeFormatter" hace 9 años
MergeFormatterPass.java Do not add a newline at the end if neither merged side had one hace 9 años
MergeMessageFormatter.java Silence non-externalized string warnings in org.eclipse.jgit hace 9 años
MergeResult.java Fix API errors raised on ResolveMerger affecting API providers only hace 9 años
MergeStrategy.java Add missing @since tags hace 11 años
Merger.java Delete deprecated Merger.getBaseCommit() hace 9 años
RecursiveMerger.java Use AutoClosable to close resources in bundle org.eclipse.jgit hace 9 años
ResolveMerger.java Use ANY_DIFF filter in ResolveMerger only for bare repositories hace 9 años
SquashMessageFormatter.java Silence non-externalized string warnings in org.eclipse.jgit hace 9 años
StrategyOneSided.java Fix exception on conflicts with recursive merge hace 10 años
StrategyRecursive.java Silence non-externalized string warnings in org.eclipse.jgit hace 9 años
StrategyResolve.java Mark non-externalizable strings as such hace 11 años
StrategySimpleTwoWayInCore.java Mark non-externalizable strings as such hace 11 años
ThreeWayMergeStrategy.java Extend merge support for bare repositories hace 13 años
ThreeWayMerger.java Fix exception on conflicts with recursive merge hace 10 años
package-info.java Add Javadoc description for packages hace 11 años