Laurent Delaigue 4409751516 Add progress monitor to Merger ... Monitoring progress of merges can be useful for users for large repositories or complex merge processes that take some time. This enables setting a monitor. Existing merge implementations in jgit do not yet report progress if a monitor is set. This will be added in a later change. Change-Id: I17b978b3fc91750dd88649638b90a46820a0877c Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>		2016-01-21 17:08:04 +01:00
..
.settings	Ignore API errors about Tree, TreeEntry, FileTreeEntry and friends being	2016-01-19 18:49:11 +01:00
META-INF	Prepare 4.2.0-SNAPSHOT builds	2016-01-19 13:10:20 +01:00
findBugs	[findBugs] Silence warning about Transport initialization	2012-09-14 00:01:47 +02:00
resources/org/eclipse/jgit	ObjectChecker: honor some git-core fsck.* options	2015-12-30 15:19:09 -08:00
src/org/eclipse/jgit	Add progress monitor to Merger	2016-01-21 17:08:04 +01:00
.classpath	Set minimum required Java version to Java 7	2015-02-09 14:11:50 +01:00
.fbprefs	Initial JGit contribution to eclipse.org	2009-09-29 16:47:03 -07:00
.gitignore	Finish removing Apache Felix maven-bundle-plugin	2010-01-12 11:46:55 -08:00
.project	Revert "Hide Maven target directories from Eclipse"	2010-08-28 09:50:50 +02:00
BUCK	Implement Buck driven build	2015-12-31 10:08:55 -08:00
about.html	Add missing about.html files to all shipped bundles	2011-06-08 21:51:51 +02:00
build.properties	Add "resources/" as a source folder	2010-06-05 14:39:27 +02:00
plugin.properties	Remove incubation marker	2011-05-31 22:53:53 +02:00
pom.xml	Prepare 4.2.0-SNAPSHOT builds	2016-01-19 13:10:20 +01:00