]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9ac415a) | patch
Use a TemporaryBuffer to do a content merge 84/116584/1
authorThomas Wolf <thomas.wolf@paranor.ch>
Fri, 2 Feb 2018 09:42:54 +0000 (10:42 +0100)
committerThomas Wolf <thomas.wolf@paranor.ch>
Fri, 2 Feb 2018 09:50:12 +0000 (10:50 +0100)
commitf22a162c472acd6ac3d6063362629915918b0a19
treed82a7a37620b35d5372450c688c5ab3fdbce07d3tree | snapshot
parent9ac415aa95bdeab77142879a7f9196deb4ebefbecommit | diff
Use a TemporaryBuffer to do a content merge

This avoids having to re-read the merged file (twice even!) to
update the index.

Change-Id: Id13e0fd38906ed6f859604f86ca352761dca9ffe
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java [changed mode: 0644->0755] diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit