Thomas Wolf 1fd15e40cc Merge conflict messages: prefix conflict lines with a hash ... C git also does so. Note that currently the comment character is hard-coded as the hash '#' throughout JGit. Bug: 548529 Change-Id: I4a5597694082a9e5b07412b365cfaf41fa034cfa Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>		2022-01-31 00:42:35 +01:00
..
.settings	Merge branch 'stable-5.7' into stable-5.8	2021-12-04 18:55:17 +01:00
META-INF	Let org.eclipse.jgit.pgm use BooleanTriState	2022-01-19 09:54:37 +01:00
findBugs	[spotbugs] Silence NP_BOOLEAN_RETURN_NULL in IgnoreNode#checkIgnored	2020-12-22 10:52:59 +01:00
resources/org/eclipse/jgit	Factor out parsing git-style size numbers to StringUtils	2021-10-30 23:05:22 +02:00
src/org/eclipse/jgit	Merge conflict messages: prefix conflict lines with a hash	2022-01-31 00:42:35 +01:00
.classpath	Bump minimum required Java version to 11	2021-09-29 17:12:12 +02:00
.fbprefs	…
.gitignore	…
.project	…
BUILD	Fix stamping to produce stable file timestamps	2020-12-14 15:45:29 +01:00
about.html	SHA-1: collision detection support	2017-02-28 16:38:43 -08:00
build.properties	…
plugin.properties	Fix bundle localization of Apache SSH bundle	2019-06-21 17:54:06 +02:00
pom.xml	Prepare 6.0.1-SNAPSHOT builds	2021-11-29 17:37:27 +01:00