diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameGenerator.java b/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameGenerator.java index 89a8846bc..ca695d2a8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameGenerator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameGenerator.java @@ -720,10 +720,8 @@ private boolean processMerge(Candidate n) throws IOException { // have an exact content match. For performance reasons // we choose to follow the one parent over trying to do // possibly both parents. - n.sourceCommit = parent; n.setSourcePath(PathFilter.create(r.getOldPath())); - push(n); - return false; + return blameEntireRegionOnParent(n, parent); } renames[pIdx] = r;