Sign in
gerrit
/
jgit
/
master
/
.
/
org.eclipse.jgit.test
/
tst-rsrc
/
org
/
eclipse
/
jgit
/
diff
/
ConflictOutOfBounds.patch
blob: 6e7448b95cbfad1de038b56bba2c5bbb159e20a6 [
file
] [
log
] [
blame
]
diff
--
git a
/
ConflictOutOfBounds
b
/
ConflictOutOfBounds
index
0000000.
.
de98044
---
a
/
ConflictOutOfBounds
+++
b
/
ConflictOutOfBounds
@@
-
25
,
4
+
25
,
4
@@
line3
-
lineA
+
lineB
line5
line6