Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-12-21 15:59:48 +01:00
Code Issues Packages Projects Releases Activity

cleanup test

Browse Source
This commit is contained in:
Eduard Heimbuch
2020-02-27 10:34:48 +01:00
parent 33037385e4
commit fbededbcaa
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
View File

@@ -173,9 +173,8 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase {
@Test @Test
public void shouldHandleUnexpectedMergeResults() { public void shouldHandleUnexpectedMergeResults() {
GitMergeCommand command = createCommand(git -> { GitMergeCommand command = createCommand(git -> {
FileWriter fw = null;
try { 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); BufferedWriter bw = new BufferedWriter(fw);
bw.write("change"); bw.write("change");
bw.newLine(); bw.newLine();