diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2017-12-07 08:13:45 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@gmail.com> | 2017-12-07 08:13:45 +0900 |
| commit | 34d56fd277584c9e14b7f468377a72a9587ba650 (patch) | |
| tree | ae81e63b0fa229f526ac89004d0bdbda7940e6e5 /org.eclipse.jgit/src/org/eclipse/jgit/dircache | |
| parent | 7f2ef4b6bac25c0690e0c67617000863ca7364b8 (diff) | |
| parent | 239043e59d78b6c8661eb9fcd51189887c081770 (diff) | |
| download | jgit-34d56fd277584c9e14b7f468377a72a9587ba650.tar.gz jgit-34d56fd277584c9e14b7f468377a72a9587ba650.zip | |
Merge branch 'stable-4.9'
* stable-4.9:
LfsStore: Make inner class AppServer static
DirCacheCheckout#processEntry: Fix typo in javadoc
Change-Id: Id8e4a3c4dc741e6e0182522e72ecb4b34ae419eb
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/dircache')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java index d30f6e45be..d3d8cd8ee3 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java @@ -443,7 +443,7 @@ public class DirCacheCheckout { * working tree was modified; even if the checkout fails. * * @return <code>false</code> if this method could not delete all the files - * which should be deleted (e.g. because of of the files was + * which should be deleted (e.g. because one of the files was * locked). In this case {@link #getToBeDeleted()} lists the files * which should be tried to be deleted outside of this method. * Although <code>false</code> is returned the checkout was |