Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
tree-walk: don't parse incorrect entries
[gitweb.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index 33ccc40ecd9aadb7fff05ec22b5e94b1567d878d..b34177d20f1cbbaefd232f070e1f72c677f4eafe 100644
(file)
--- 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 a
n
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,