| Chunk |
|---|
| Conflicting content |
|---|
.compile("\\s*<\\?xml\\s+version=\"[.\\d]+\"\\s+.*\\?>");
private static final Pattern RE_HTML_ELEMENTS = Pattern
.compile("(?i)\\s*<(HTML|HEAD|STYLE|SCRIPT|META|BODY)(\\s|>)");
<<<<<<< HEAD
private static final Pattern RE_DOCTYPE_HTML = Pattern
.compile("(?i)\\s*>>>>>> a7285fabaf7bd3b71e09ce281d38a0a0297adda8
.compile("(?s)\\s*");
private static final Pattern RE_END_TAG = Pattern
.compile("(?i)"); |
| Solution content |
|---|
.compile("\\s*<\\?xml\\s+version=\"[.\\d]+\"\\s+.*\\?>");
private static final Pattern RE_HTML_ELEMENTS = Pattern
.compile("(?i)\\s*<(HTML|HEAD|STYLE|SCRIPT|META|BODY)(\\s|>)");
private static final Pattern RE_DOCTYPE_HTML = Pattern
.compile("(?i)\\s*");
private static final Pattern RE_END_TAG = Pattern
.compile("(?i)"); |
| File |
|---|
| SimpleMimeTypeDetector.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
assertEquals("text/html", detectMimeType("html/3.html", "unk"));
assertEquals("text/html", detectMimeType("html/4.html", "text/html"));
assertEquals("text/html", detectMimeType("html/5.html", "text/html"));
<<<<<<< HEAD
=======
assertEquals("text/html", detectMimeType("html/6.html", "text/html"));
>>>>>>> a7285fabaf7bd3b71e09ce281d38a0a0297adda8
}
public void testContentSniffing_JavaScript() throws Exception { |
| Solution content |
|---|
assertEquals("text/html", detectMimeType("html/3.html", "unk"));
assertEquals("text/html", detectMimeType("html/4.html", "text/html"));
assertEquals("text/html", detectMimeType("html/5.html", "text/html"));
assertEquals("text/html", detectMimeType("html/6.html", "text/html"));
}
public void testContentSniffing_JavaScript() throws Exception { |
| File |
|---|
| SimpleMimeTypeDetectorTest.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |