aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/resources
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2011-08-17 07:31:54 -0400
committerCode Review <codereview-daemon@eclipse.org>2011-08-17 07:31:54 -0400
commit148595fb54265265a5409339d168ee2b8e2bfed1 (patch)
treed32148fd0310ccbb51f65c02f2788199e1821465 /org.eclipse.jgit/resources
parentac909ec89d7a6f59e2d02dcc900a4f80576b12a4 (diff)
parent679cab9b3297e550a9ae04b88ba839dc9eb84957 (diff)
downloadjgit-148595fb54265265a5409339d168ee2b8e2bfed1.tar.gz
jgit-148595fb54265265a5409339d168ee2b8e2bfed1.zip
Merge "Adds DiffEntry.scan(TreeWalk, boolean) method"
Diffstat (limited to 'org.eclipse.jgit/resources')
-rw-r--r--org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties2
1 files changed, 2 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 8c87d2a6b0..9cc0e022ea 100644
--- a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
@@ -492,3 +492,5 @@ year=year
years=years
yearsAgo={0} years ago
yearsMonthsAgo={0} {1}, {2} {3} ago
+treeWalkMustHaveExactlyTwoTrees=TreeWalk should have exactly two trees.
+cannotBeRecursiveWhenTreesAreIncluded=TreeWalk shouldn't be recursive when tree objects are included.