Shawn Pearce 2c33c725f9 ResolveMerger: push result file creation into updateIndex() ... The only caller of writeMergedFile is updateIndex, and the only user of this path object is the code within the method. This is a no-op change that opens the door to refactoring the way temp files are handled for inCore merges. Change-Id: I863a303194689a806b667e55eb958e1decf046c1		2014-08-08 15:04:57 -07:00
..
.settings	Fix API errors raised on ResolveMerger affecting API providers only	2014-07-31 00:02:17 +02:00
META-INF	Mark package org.eclipse.jgit.gitrepo.internal as x-internal	2014-07-30 23:54:24 +02:00
findBugs	[findBugs] Silence warning about Transport initialization	2012-09-14 00:01:47 +02:00
resources/org/eclipse/jgit	Fixed message for exception thrown during recursive merge	2014-07-28 14:43:22 +02:00
src/org/eclipse/jgit	ResolveMerger: push result file creation into updateIndex()	2014-08-08 15:04:57 -07:00
.classpath	Externalize strings from JGit	2010-05-19 14:37:16 -07: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
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 3.4.2-SNAPSHOT builds	2014-06-21 00:57:43 +02:00