diff options
| author | Christian Halstrick <christian.halstrick@sap.com> | 2010-03-05 09:31:33 +0100 |
|---|---|---|
| committer | Chris Aniszczyk <caniszczyk@gmail.com> | 2011-03-29 12:27:45 -0500 |
| commit | 153283f05adc7cd3da44d49d576ec2562ac76608 (patch) | |
| tree | d560ba28e6e8d2bdf9722f9009a303d250735f62 /org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | |
| parent | eac2dc18f11e517d995cf2db68d5675390daa02b (diff) | |
| download | jgit-153283f05adc7cd3da44d49d576ec2562ac76608.tar.gz jgit-153283f05adc7cd3da44d49d576ec2562ac76608.zip | |
Added Merge command to the CLI
This merge command accepts the merge strategy as option and uses the
resolve strategy as default. It expects exactly one other
revision which is merged with current head.
Change-Id: Ia8c188b93ade4afabe6a9ccf267faf045f359a3a
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
Diffstat (limited to 'org.eclipse.jgit.pgm/META-INF/MANIFEST.MF')
| -rw-r--r-- | org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 9825031ce2..484d32d418 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -14,6 +14,7 @@ Import-Package: org.eclipse.jgit.api;version="[0.12.0,0.13.0)", org.eclipse.jgit.errors;version="[0.12.0,0.13.0)", org.eclipse.jgit.iplog;version="[0.12.0,0.13.0)", org.eclipse.jgit.lib;version="[0.12.0,0.13.0)", + org.eclipse.jgit.merge;version="0.12.0", org.eclipse.jgit.nls;version="[0.12.0,0.13.0)", org.eclipse.jgit.notes;version="[0.12.0,0.13.0)", org.eclipse.jgit.revplot;version="[0.12.0,0.13.0)", |