From fbededbcaa8d352acd55ffdc617dd57553c9adec Mon Sep 17 00:00:00 2001
From: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Date: Thu, 27 Feb 2020 10:34:48 +0100
Subject: [PATCH] cleanup test

---
 .../java/sonia/scm/repository/spi/GitMergeCommandTest.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
index 8699533c00..f39644119e 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
@@ -173,9 +173,8 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase {
   @Test
   public void shouldHandleUnexpectedMergeResults() {
     GitMergeCommand command = createCommand(git -> {
-      FileWriter fw = null;
       try {
-        fw = new FileWriter(new File(git.getRepository().getWorkTree(), "b.txt"), true);
+        FileWriter fw = new FileWriter(new File(git.getRepository().getWorkTree(), "b.txt"), true);
         BufferedWriter bw = new BufferedWriter(fw);
         bw.write("change");
         bw.newLine();