diff options
| author | Denys Digtiar <duemir@gmail.com> | 2011-07-18 08:33:30 +0300 |
|---|---|---|
| committer | Chris Aniszczyk <zx@twitter.com> | 2011-08-21 13:53:02 -0700 |
| commit | c580c56c4def9639b603553b3d4cbc7117a30938 (patch) | |
| tree | d3801915c28f1baa1b3215e9eb691021d6c64614 /org.eclipse.jgit.test/META-INF | |
| parent | e38cf2078d22e2c902a373371382ac8d82268f2d (diff) | |
| download | jgit-c580c56c4def9639b603553b3d4cbc7117a30938.tar.gz jgit-c580c56c4def9639b603553b3d4cbc7117a30938.zip | |
Fix ClassCastException in MergeCommand
Test was added which reproduce the ClassCastException when ours or
theirs merge strategy is set to MergeCommand. Merger and MergeCommand
were updated in order to avoid exception.
Change-Id: I4c1284b4e80d82638d0677a05e5d38182526d196
Signed-off-by: Denys Digtiar <duemir@gmail.com>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
Diffstat (limited to 'org.eclipse.jgit.test/META-INF')
| -rw-r--r-- | org.eclipse.jgit.test/META-INF/MANIFEST.MF | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index d7f7ef1b6e..06db49d87a 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -38,9 +38,11 @@ Import-Package: org.eclipse.jgit;version="[1.1.0,1.2.0)", org.eclipse.jgit.treewalk.filter;version="[1.1.0,1.2.0)", org.eclipse.jgit.util;version="[1.1.0,1.2.0)", org.eclipse.jgit.util.io;version="[1.1.0,1.2.0)", - org.junit;version="[4.0.0,5.0.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", - org.hamcrest;version="[1.1.0,2.0.0)" + org.hamcrest;version="[1.1.0,2.0.0)", + org.junit;version="[4.4.0,5.0.0)", + org.junit.runner;version="[4.4.0,5.0.0)", + org.junit.experimental.theories;version="[4.4.0,5.0.0)" Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)" Export-Package: org.eclipse.jgit.lib |