]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2b444d7) | patch
Avoid loading and merging binary data in ResolveMerger 19/106519/14
authorHan-Wen Nienhuys <hanwen@google.com>
Tue, 10 Oct 2017 14:40:12 +0000 (16:40 +0200)
committerHan-Wen Nienhuys <hanwen@google.com>
Tue, 24 Oct 2017 13:07:04 +0000 (15:07 +0200)
commitced658c445b9087c57eaa3d470f46afec4a4995f
tree3182398a86ff6d12145f19eaca376deba5a8fdectree | snapshot
parent2b444d781c41194e35217c3876ee1fe07160e35acommit | diff
Avoid loading and merging binary data in ResolveMerger

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
Change-Id: Ide4b68872d426aa262142f224acf636c776b35d3
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java diff | blob | history
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