diff options
| author | Dave Borowitz <dborowitz@google.com> | 2015-03-18 10:46:41 -0700 |
|---|---|---|
| committer | Dave Borowitz <dborowitz@google.com> | 2015-03-23 13:03:31 -0700 |
| commit | f1a15f7eb09183124ea645a8bfc16a03d58fd385 (patch) | |
| tree | 8583a1146018ef0534912f7709154804f6bb1b54 /org.eclipse.jgit.junit/META-INF | |
| parent | dd453f4185c8e7e9608605a35abd4ac4eaadba76 (diff) | |
| download | jgit-f1a15f7eb09183124ea645a8bfc16a03d58fd385.tar.gz jgit-f1a15f7eb09183124ea645a8bfc16a03d58fd385.zip | |
TestRepository: Add a cherryPick method
CherryPickCommand only works on a non-bare repository, as it must
modify the working tree and index in case of a merge conflict. In
tests, being able to recover from a merge conflict is less important,
as the caller should be able to control the full contents of files in
advance of the cherry-pick.
Change-Id: Ic332e44df1308b9336e884666b08c1f6db64513d
Diffstat (limited to 'org.eclipse.jgit.junit/META-INF')
| -rw-r--r-- | org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index b20464e397..327a697f66 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -14,6 +14,7 @@ Import-Package: org.eclipse.jgit.api;version="[4.0.0,4.1.0)", org.eclipse.jgit.internal.storage.file;version="[4.0.0,4.1.0)", org.eclipse.jgit.internal.storage.pack;version="[4.0.0,4.1.0)", org.eclipse.jgit.lib;version="[4.0.0,4.1.0)", + org.eclipse.jgit.merge;version="[4.0.0,4.1.0)", org.eclipse.jgit.revwalk;version="[4.0.0,4.1.0)", org.eclipse.jgit.storage.file;version="[4.0.0,4.1.0)", org.eclipse.jgit.treewalk;version="[4.0.0,4.1.0)", |