aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2018-05-10 12:08:46 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2018-05-10 12:08:46 +0200
commitd5ff94d57533c885ab1e2c41123229d09dbe1834 (patch)
treee848ac344cb3b90dbd84c8f9ec209de6ac39057c /org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
parent4ac790fda856296128f475558493c2db4c6d6bda (diff)
parent1887c834772d9e035b50ebda4922aa5c8159a31f (diff)
downloadjgit-d5ff94d57533c885ab1e2c41123229d09dbe1834.tar.gz
jgit-d5ff94d57533c885ab1e2c41123229d09dbe1834.zip
Merge branch 'stable-4.7' into stable-4.8
* stable-4.7: Retry stale file handles on .git/config file Change-Id: Ib665c094b28eefb8236752bb273de0c2d9bf9578
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java')
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
index 2ba3b8fd1c..99ef2a61f4 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
@@ -185,6 +185,7 @@ public class JGitText extends TranslationBundle {
/***/ public String commitOnRepoWithoutHEADCurrentlyNotSupported;
/***/ public String commitAmendOnInitialNotPossible;
/***/ public String compressingObjects;
+ /***/ public String configHandleIsStale;
/***/ public String connectionFailed;
/***/ public String connectionTimeOut;
/***/ public String contextMustBeNonNegative;