summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/resources/org
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@gmail.com>2018-09-12 19:03:26 +0900
committerDavid Pursehouse <david.pursehouse@gmail.com>2018-09-12 19:03:32 +0900
commitfc480b3efcb7264ffc331aaf0243404f6499d7f8 (patch)
tree9e44eb21e5dc89486e58f4922afc21308516a38d /org.eclipse.jgit/resources/org
parent8527e74ea0ed9413bf8d7fd2bb091b607d1e28b6 (diff)
parent83c0369e29e4b4abc56010df34b5e2e29417ff9f (diff)
downloadjgit-fc480b3efcb7264ffc331aaf0243404f6499d7f8.tar.gz
jgit-fc480b3efcb7264ffc331aaf0243404f6499d7f8.zip
Merge branch 'stable-4.11' into stable-5.0
* stable-4.11: Fix NoSuchFileException during directory cleanup in RefDirectory Externalize warning message in RefDirectory.delete() Suppress warning for trying to delete non-empty directory Change-Id: Ic7eaa0b6a4e750bc7853eb549a9e126269ae22cf Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
Diffstat (limited to 'org.eclipse.jgit/resources/org')
-rw-r--r--org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties1
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 eaaf7f01bb..c8b24f559f 100644
--- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
@@ -705,6 +705,7 @@ truncatedHunkOldLinesMissing=Truncated hunk, at least {0} old lines is missing
tSizeMustBeGreaterOrEqual1=tSize must be >= 1
unableToCheckConnectivity=Unable to check connectivity.
unableToCreateNewObject=Unable to create new object: {0}
+unableToRemovePath=Unable to remove path ''{0}''
unableToStore=Unable to store {0}.
unableToWrite=Unable to write {0}
unauthorized=Unauthorized