Robin Stocker a50ed5666f status: Print conflict description for unmerged paths ... Prefix unmerged paths with conflict description (e.g. "both modified:"), the same way C Git does. Change-Id: I083cd191ae2ad3e2460aa4052774aed6e36c2699		2013-04-19 19:55:24 +02:00
..
.settings	Harmonize the JDT settings within JGit	2012-11-16 10:25:45 -08:00
META-INF	Remove unused dependencies	2013-04-09 16:57:54 +02:00
src/org/eclipse/jgit	Add the no-commit option to MergeCommand	2013-04-04 15:11:49 +02:00
tst/org/eclipse/jgit/pgm	status: Print conflict description for unmerged paths	2013-04-19 19:55:24 +02:00
.classpath	Allow to write tests with CLI syntax	2012-04-18 18:57:36 +02:00
.gitignore	Allow to write tests with CLI syntax	2012-04-18 18:57:36 +02:00
.project	Allow to write tests with CLI syntax	2012-04-18 18:57:36 +02:00
about.html	Allow to write tests with CLI syntax	2012-04-18 18:57:36 +02:00
build.properties	Allow to write tests with CLI syntax	2012-04-18 18:57:36 +02:00
org.eclipse.jgit.pgm--All-Tests.launch	Allow to write tests with CLI syntax	2012-04-18 18:57:36 +02:00
plugin.properties	Fix plugin provider names to conform with release train requirement	2013-04-08 23:05:36 +02:00
pom.xml	JGit 3.0: move internal classes into an internal subpackage	2013-03-18 09:30:43 -07:00