aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/resources/org
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@gmail.com>2018-09-12 14:05:46 +0900
committerDavid Pursehouse <david.pursehouse@gmail.com>2018-09-12 14:05:54 +0900
commitdb756e914708ff29d93c2cba040aa19ea1a485c6 (patch)
tree245f501b66174077943d1c1f6570d287ee6e148f /org.eclipse.jgit/resources/org
parent81735222c94069edb0e0434b717ab87011b51901 (diff)
parent667ac8b3189336efbdb0484e212c36beb4ed5338 (diff)
downloadjgit-db756e914708ff29d93c2cba040aa19ea1a485c6.tar.gz
jgit-db756e914708ff29d93c2cba040aa19ea1a485c6.zip
Merge branch 'stable-4.7' into stable-4.8
* stable-4.7: Fix NoSuchFileException during directory cleanup in RefDirectory Externalize warning message in RefDirectory.delete() Suppress warning for trying to delete non-empty directory Change-Id: I9ec6352b5ff57aa1a3380079dc9165890cc76d49 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 8fce30a2af..c9aaa39945 100644
--- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
@@ -649,6 +649,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