Merge fixes up to GIT 1.0.7

Signed-off-by: Junio C Hamano <junkio@cox.net>

1 files changed, 1 insertions, 1 deletions

diff --git a/diff.c b/diff.c
index 66057e5d61..17d68fa699 100644
--- a/diff.c
+++ b/diff.c
@@ -787,7 +787,7 @@ int diff_setup_done(struct diff_options *options)
 			 * so it is safe for us to do this here.  Also
 			 * it does not smudge active_cache or active_nr
 			 * when it fails, so we do not have to worry about
-			 * cleaning it up oufselves either.
+			 * cleaning it up ourselves either.
 			 */
 			read_cache();
 	}