]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 300a55d) | patch
Revert "ResolveMerge only needs to visit differing TreeEntries" 07/45607/3
authorChristian Halstrick <christian.halstrick@sap.com>
Fri, 10 Apr 2015 05:52:19 +0000 (07:52 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Fri, 10 Apr 2015 21:06:36 +0000 (17:06 -0400)
commit510aed1493df6d767152c3f35f3878bbeb524495
treefec69c5618631bc261cf54e269ed8dd952439613tree | snapshot
parent300a55dcba9e38d8cbd56b206de682a2e00da402commit | diff
Revert "ResolveMerge only needs to visit differing TreeEntries"

This reverts commit bda5e764200dafb2311149a9152c02373127287d. This reduces
performance at least for non-bare repositories.

Change-Id: Ib26cf8372f210798e104112edf14e91bfeaf23ec
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit