summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2008-01-03 14:18:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-01-03 17:15:17 (GMT)
commit790296fd8863d649054096191d33bacbbf5c2115 (patch)
treecdcd2549cfa71e3463ab1757aa1db1ad3b7188dc /merge-recursive.c
parent698a68be7b0df6dd8d0880e0e2167cad8688a6ad (diff)
downloadgit-790296fd8863d649054096191d33bacbbf5c2115.zip
git-790296fd8863d649054096191d33bacbbf5c2115.tar.gz
git-790296fd8863d649054096191d33bacbbf5c2115.tar.bz2
Fix grammar nits in documentation and in code comments.
Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 33ccc40..b34177d 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -289,7 +289,7 @@ static int get_files_dirs(struct tree *tree)
}
/*
- * Returns a index_entry instance which doesn't have to correspond to
+ * Returns an index_entry instance which doesn't have to correspond to
* a real cache entry in Git's index.
*/
static struct stage_data *insert_stage_data(const char *path,