diff options
| author | Dave Borowitz <dborowitz@google.com> | 2017-03-31 11:49:12 -0400 |
|---|---|---|
| committer | Jonathan Nieder <jrn@google.com> | 2017-04-05 17:50:54 -0400 |
| commit | 4c3e274588060d9ab2e05d7919f506789bcbbc0b (patch) | |
| tree | 241e54a6bfdba3a7036c030d094e3da5a5b733da /org.eclipse.jgit/resources/org | |
| parent | aec22e74cf76d7b7ea53d526b908613eaeac5b55 (diff) | |
| download | jgit-4c3e274588060d9ab2e05d7919f506789bcbbc0b.tar.gz jgit-4c3e274588060d9ab2e05d7919f506789bcbbc0b.zip | |
Support creating Mergers without a Repository
All that's really required to run a merge operation is a single
ObjectInserter, from which we can construct a RevWalk, plus a Config
that declares a diff algorithm. Provide some factory methods that don't
take Repository.
Change-Id: Ib884dce2528424b5bcbbbbfc043baec1886b9bbd
Diffstat (limited to 'org.eclipse.jgit/resources/org')
| -rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index 4ac399f9ec..da076dcb7f 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -538,6 +538,7 @@ renamesFindingExact=Finding exact renames renamesRejoiningModifies=Rejoining modified file pairs repositoryAlreadyExists=Repository already exists: {0} repositoryConfigFileInvalid=Repository config file {0} invalid {1} +repositoryIsRequired=repository is required repositoryNotFound=repository not found: {0} repositoryState_applyMailbox=Apply mailbox repositoryState_bare=Bare |