diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-01-05 20:54:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-05 20:54:42 -0800 |
| commit | 5df466c507ee2dd81c2e9002c3fedf3536cde0dc (patch) | |
| tree | 92fff315690007bbbdaa9116570a8a49b01f5420 /diff-index.c | |
| parent | 58e3fb40f7ca1c28f9105c15166884f80bb22e55 (diff) | |
| parent | 92e802c6ccb96d1b5e8561b0a136d43d82253293 (diff) | |
| download | git-5df466c507ee2dd81c2e9002c3fedf3536cde0dc.tar.gz | |
Merge fixes up to GIT 1.0.7
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff-index.c')
| -rw-r--r-- | diff-index.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-index.c b/diff-index.c index 0054883a5e..87e1061983 100644 --- a/diff-index.c +++ b/diff-index.c @@ -116,7 +116,7 @@ static int diff_cache(struct cache_entry **ac, int entries, const char **pathspe /* We come here with ce pointing at stage 1 * (original tree) and ac[1] pointing at stage * 3 (unmerged). show-modified with - * report-mising set to false does not say the + * report-missing set to false does not say the * file is deleted but reports true if work * tree does not have it, in which case we * fall through to report the unmerged state. |