diff options
| author | Tomasz Zarna <Tomasz.Zarna@pl.ibm.com> | 2012-09-14 17:31:33 +0200 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2012-09-17 07:07:00 -0700 |
| commit | f7b644df66d5f975d858aca3f977f31baf4a2264 (patch) | |
| tree | fc626cdd0a8d73082321871886a650410d6a46fd /org.eclipse.jgit.pgm.test/META-INF | |
| parent | 18e020218b210ef5867bb07ff8f2b889e467d7fc (diff) | |
| download | jgit-f7b644df66d5f975d858aca3f977f31baf4a2264.tar.gz jgit-f7b644df66d5f975d858aca3f977f31baf4a2264.zip | |
Add tests for output result of merging -- org.eclipse.jgit.pgm.Merge
Change-Id: I888c7e80503b869d65a9617e6a07e01d1ff5f197
Diffstat (limited to 'org.eclipse.jgit.pgm.test/META-INF')
| -rw-r--r-- | org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 61007f98b2..7f6d75b47a 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -10,6 +10,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.eclipse.jgit.api;version="[2.1.0,2.2.0)", org.eclipse.jgit.junit;version="[2.1.0,2.2.0)", org.eclipse.jgit.lib;version="[2.1.0,2.2.0)", + org.eclipse.jgit.merge;version="[2.1.0,2.2.0)", org.eclipse.jgit.pgm;version="[2.1.0,2.2.0)", org.eclipse.jgit.pgm.opt;version="[2.1.0,2.2.0)", org.eclipse.jgit.revwalk;version="[2.1.0,2.2.0)", |