diff options
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java index 95236a30db..083abe5f02 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java @@ -318,6 +318,8 @@ public class JGitText extends TranslationBundle { /***/ public String lockOnNotClosed; /***/ public String lockOnNotHeld; /***/ public String malformedpersonIdentString; + /***/ public String mergeConflictOnNotes; + /***/ public String mergeConflictOnNonNoteEntries; /***/ public String mergeStrategyAlreadyExistsAsDefault; /***/ public String mergeStrategyDoesNotSupportHeads; /***/ public String mergeUsingStrategyResultedInDescription; |