Merge branch 'Develop'

Author: host6

src/main/java/org/scm4j/vcs/GitVCS.java

@@ -414,17 +414,15 @@ public List<VCSDiffEntry> getBranchesDiff(String srcBranchName, String dstBranch
 
 			List<VCSDiffEntry> res = new ArrayList<>();
 			for (DiffEntry diffEntry : diffs) {
-				VCSDiffEntry vcsEntry = new VCSDiffEntry(
-						diffEntry.getPath(diffEntry.getChangeType() == ChangeType.ADD ? Side.NEW : Side.OLD),
-						gitChangeTypeToVCSChangeType(diffEntry.getChangeType()));
-
-
 				ByteArrayOutputStream baos = new ByteArrayOutputStream();
 				try (DiffFormatter formatter = new DiffFormatter(baos)) {
 					formatter.setRepository(git.getRepository());
 					formatter.format(diffEntry);
 				}
-				vcsEntry.setUnifiedDiff(baos.toString("UTF-8"));
+				VCSDiffEntry vcsEntry = new VCSDiffEntry(
+						diffEntry.getPath(diffEntry.getChangeType() == ChangeType.ADD ? Side.NEW : Side.OLD),
+						gitChangeTypeToVCSChangeType(diffEntry.getChangeType()), 
+						baos.toString("UTF-8"));
 				res.add(vcsEntry);
 			}
 			return res;