Han-Wen Nienhuys a551b64694 Treat RawText of binary data as file with one single line. ... This avoids executing mergeAlgorithm.merge on binary data, which is unlikely to be useful. Arguably, binary data should not make it to ResolveMerger#contentMerge, but this approach has the following advantages: * binary detection is exact, since it doesn't only look at the start of the blob. * it is cheap, as we have to iterate over the bytes anyway to find '\n'. Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> Change-Id: I424295df1dc60a719859d9d7c599067891b15792		2017-08-01 16:00:46 +02:00
..
.settings	Enable and fix warnings about redundant specification of type arguments	2017-02-20 22:47:23 +01:00
META-INF	Prepare 4.8.0-SNAPSHOT builds	2017-04-05 14:49:49 +02:00
exttst/org/eclipse/jgit	Enable and fix warnings about redundant specification of type arguments	2017-02-20 22:47:23 +01:00
src/org/eclipse/jgit/lib	Enable and fix warnings about redundant specification of type arguments	2017-02-20 22:47:23 +01:00
tst/org/eclipse/jgit	Treat RawText of binary data as file with one single line.	2017-08-01 16:00:46 +02:00
tst-rsrc	SHA-1: collision detection support	2017-02-28 16:38:43 -08:00
.classpath	Change JGit minimum execution environment to JavaSE-1.8	2016-09-20 11:32:36 +02:00
.gitignore	Extend the FS class for Java7	2013-05-04 02:01:56 +02:00
.project	Remove references to org.eclipse.jgit.java7	2016-08-05 11:22:27 +09:00
BUILD	Add remaining parts of the bazel build	2017-03-21 09:24:12 +01:00
build.properties	Add missing dependency to slf4j-log4j bridge	2016-09-05 04:53:14 -04:00
org.eclipse.jgit.core--All-Tests (Java 8) (de).launch	Fixed few locale dependent pgm tests	2016-01-02 17:41:58 +01:00
org.eclipse.jgit.core--All-Tests (Java 8).launch	Fix classpath of test launch configurations	2015-11-21 00:33:43 +01:00
org.eclipse.jgit.core--All-Tests.launch	Use JUnit4 for tests	2010-08-26 12:26:38 -05:00
org.eclipse.jgit.test-WalkEncryptionTest-Proxy.launch	Adding AES Walk Encryption support in http://www.jets3t.org/ mode	2015-10-18 19:14:31 +00:00
org.eclipse.jgit.test-WalkEncryptionTest.launch	Adding AES Walk Encryption support in http://www.jets3t.org/ mode	2015-10-18 19:14:31 +00:00
plugin.properties	Fix plugin provider names to conform with release train requirement	2013-04-08 23:05:36 +02:00
pom.xml	Prepare 4.7.1-SNAPSHOT	2017-04-06 00:16:53 +02:00
tests.bzl	bazel: Consume hamcrest through transitive dependency	2017-03-23 06:47:49 +01:00