Merge branch 'maint' of git://repo.or.cz/git-gui into maint

diff --git a/diff.c b/diff.c
index b23e1906783664103cf9b363a93a35f7d043c8ee..af282ddd8818aacdc516ff6f9dff4d84097cbab0 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -1349,7 +1349,7 @@ void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1,
 }
 
 /*
- * Given a name and sha1 pair, if the dircache tells us the file in
+ * Given a name and sha1 pair, if the index tells us the file in
  * the work tree has that object contents, return true, so that
  * prepare_temp_file() does not have to inflate and extract.
  */