diff options
| author | Tomasz Zarna <Tomasz.Zarna@pl.ibm.com> | 2012-03-04 21:14:23 -0800 |
|---|---|---|
| committer | Chris Aniszczyk <zx@twitter.com> | 2012-03-04 21:29:01 -0800 |
| commit | 92f90eb2298100c593fe233195ccf2de5bdf47cf (patch) | |
| tree | 275697fcdb1b9920a0c763f3b90c6fad365b3aaa /org.eclipse.jgit/resources | |
| parent | 8e1bc46061930c8c89faa0444d531958ac0e8d8d (diff) | |
| download | jgit-92f90eb2298100c593fe233195ccf2de5bdf47cf.tar.gz jgit-92f90eb2298100c593fe233195ccf2de5bdf47cf.zip | |
Add ApplyCommand to JGit API
Bug: 361548
CQ: 6243
Change-Id: I08e1369e142bb19f42a8d7bbb5a7d062cc8533fc
Signed-off-by: Chris Aniszczyk <zx@twitter.com>
Diffstat (limited to 'org.eclipse.jgit/resources')
| -rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties index 3e9d7389a0..2f07c97acc 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties @@ -347,6 +347,8 @@ packingCancelledDuringObjectsWriting=Packing cancelled during objects writing packObjectCountMismatch=Pack object count mismatch: pack {0} index {1}: {2} packTooLargeForIndexVersion1=Pack too large for index version 1 packWriterStatistics=Total {0,number,#0} (delta {1,number,#0}), reused {2,number,#0} (delta {3,number,#0}) +patchApplyException=Cannot apply: {0} +patchFormatException=Format error: {0} pathIsNotInWorkingDir=Path is not in working dir pathNotConfigured=Submodule path is not configured peeledLineBeforeRef=Peeled line before ref. @@ -378,6 +380,7 @@ remoteNameCantBeNull=Remote name can't be null. renameBranchFailedBecauseTag=Can not rename as Ref {0} is a tag renameBranchFailedUnknownReason=Rename failed with unknown reason renameBranchUnexpectedResult=Unexpected rename result {0} +renameFileFailed=Could not rename file {0} to {1} renamesAlreadyFound=Renames have already been found. renamesBreakingModifies=Breaking apart modified file pairs renamesFindingByContent=Finding renames by content similarity |