From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 17 Feb 2010 22:55:09 +0000 (-0800)
Subject: Merge branch 'jc/typo' into maint
X-Git-Tag: v1.7.0.1~18
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/07cb9a369e12633e1e43e0acded32885592a455c?hp=-c

Merge branch 'jc/typo' into maint

* jc/typo:
Typofixes outside documentation area
---

07cb9a369e12633e1e43e0acded32885592a455c
diff --combined diff.c
index 68def6caed,9038057a76..989dbc54cb
--- a/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