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.
Laurent Delaigue 4409751516 Add progress monitor to Merger 8 yıl önce
..
EolAwareOutputStream.java Optimize EolAwareOutputStream for bulk output 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 Revert "Fix unchecked conversion warning in MergeFormatter" 9 yıl önce
MergeFormatterPass.java Do not add a newline at the end if neither merged side had one 9 yıl önce
MergeMessageFormatter.java Null-annotated Ref class and fixed related compiler errors 8 yıl önce
MergeResult.java [performance] Remove synthetic access$ methods in dfs, diff and merge 8 yıl önce
MergeStrategy.java Add missing @since tags 11 yıl önce
Merger.java Add progress monitor to Merger 8 yıl önce
RecursiveMerger.java DirCache: Add helper to read from a tree 8 yıl önce
ResolveMerger.java Null-annotated Repository class and fixed related compiler errors 8 yıl önce
SquashMessageFormatter.java Silence non-externalized string warnings in org.eclipse.jgit 9 yıl önce
StrategyOneSided.java Fix exception on conflicts with recursive merge 10 yıl önce
StrategyRecursive.java Silence non-externalized string warnings in org.eclipse.jgit 9 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