Merge branch 'jc/typo' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Feb 2010 22:55:09 +0000 (14:55 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Feb 2010 22:55:09 +0000 (14:55 -0800)
* jc/typo:
Typofixes outside documentation area

1  2 
diff.c
diff --combined diff.c
index 68def6caed876669d38f1baafc5a0cd6318ab16a,9038057a76bcda8eeab42ba133cae0bf5d1e6571..989dbc54cbb31c095cc45fb5bb74f62077f1c635
--- 1/diff.c
--- 2/diff.c
+++ b/diff.c
@@@ -2893,8 -2893,6 +2893,8 @@@ int diff_opt_parse(struct diff_options 
                ;
        else if (!prefixcmp(arg, "--output=")) {
                options->file = fopen(arg + strlen("--output="), "w");
 +              if (!options->file)
 +                      die_errno("Could not open '%s'", arg + strlen("--output="));
                options->close_file = 1;
        } else
                return 0;
@@@ -3644,7 -3642,7 +3644,7 @@@ static void diffcore_skip_stat_unmatch(
                struct diff_filepair *p = q->queue[i];
  
                /*
-                * 1. Entries that come from stat info dirtyness
+                * 1. Entries that come from stat info dirtiness
                 *    always have both sides (iow, not create/delete),
                 *    one side of the object name is unknown, with
                 *    the same mode and size.  Keep the ones that