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 пре 9 година
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 година