diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitHunkParser.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitHunkParser.java
index 88eae483cf..197c1ed03a 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitHunkParser.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitHunkParser.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-    
+
 package sonia.scm.repository.spi;
 
 import sonia.scm.repository.api.DiffLine;
@@ -49,9 +49,9 @@ final class GitHunkParser {
   public List<Hunk> parse(String content) {
     List<Hunk> hunks = new ArrayList<>();
 
-    try (Scanner scanner = new Scanner(content)) {
-      while (scanner.hasNextLine()) {
-        String line = scanner.nextLine();
+    try (Scanner scanner = new Scanner(content).useDelimiter("[\n\r\u2028\u2029\u0085]+")) {
+      while (scanner.hasNext()) {
+        String line = scanner.next();
         if (line.startsWith("@@")) {
           parseHeader(hunks, line);
         } else if (currentGitHunk != null) {
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitHunkParserTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitHunkParserTest.java
index 4bd56a0b1f..fda99ed7bf 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitHunkParserTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitHunkParserTest.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-    
+
 package sonia.scm.repository.spi;
 
 import org.junit.jupiter.api.Test;
@@ -103,6 +103,15 @@ class GitHunkParserTest {
     "+added line\n" +
     "\\ No newline at end of file\n";
 
+  private static final String MULTIPLE_LINE_BREAKS = "diff --git a/.editorconfig b/.editorconfig\n" +
+    "index ea2a3ba..2f02f32 100644\n" +
+    "--- a/.editorconfig\n" +
+    "+++ b/.editorconfig\n" +
+    "@@ -10,3 +10,4 @@\n" +
+    " indent_style = space\r\r\n" +
+    " indent_size = 2\r\r\n" +
+    " charset = utf-8\n";
+
   @Test
   void shouldParseHunks() {
     List<Hunk> hunks = new GitHunkParser().parse(DIFF_001);
@@ -183,6 +192,24 @@ void shouldIgnoreNoNewlineLine() {
     assertThat(lastLine.getContent()).isEqualTo("added line");
   }
 
+  @Test
+  void shouldHandleMultipleLineBreaks() {
+    List<Hunk> hunks = new GitHunkParser().parse(MULTIPLE_LINE_BREAKS);
+
+    Hunk hunk = hunks.get(0);
+
+    Iterator<DiffLine> lines = hunk.iterator();
+
+    DiffLine line1 = lines.next();
+    assertThat(line1.getOldLineNumber()).hasValue(10);
+    assertThat(line1.getNewLineNumber()).hasValue(10);
+    assertThat(line1.getContent()).isEqualTo("indent_style = space");
+
+    lines.next();
+    lines.next();
+    assertThat(lines.hasNext()).isFalse();
+  }
+
   private void assertHunk(Hunk hunk, int oldStart, int oldLineCount, int newStart, int newLineCount) {
     assertThat(hunk.getOldStart()).isEqualTo(oldStart);
     assertThat(hunk.getOldLineCount()).isEqualTo(oldLineCount);