3ea694c252
Currently, after a merge/cherry-pick/rebase, all index entries are smudged as the ResolveMerger never sets entry lengths and/or modification times. This change teaches it to re-set them at least for things it did not touch. The other entries are then repaired when the index is persisted, or entries are checked out. Change-Id: I0944f2017483d32043d0d09409b13055b5609a4b Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> |
||
---|---|---|
.. | ||
.settings | ||
META-INF | ||
exttst/org/eclipse/jgit/patch | ||
tst/org/eclipse/jgit | ||
tst-rsrc | ||
.classpath | ||
.gitignore | ||
.project | ||
build.properties | ||
org.eclipse.jgit.core--All-External-Tests (Java 6).launch | ||
org.eclipse.jgit.core--All-External-Tests.launch | ||
org.eclipse.jgit.core--All-Tests (Java 6).launch | ||
org.eclipse.jgit.core--All-Tests.launch | ||
plugin.properties | ||
pom.xml |