Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git-pack-objects: mark the delta packing with a 'D'.
[gitweb.git]
/
merge-base.c
diff --git
a/merge-base.c
b/merge-base.c
index 04f40fc8c57b2531393532e9f62de229a07224a4..12ebb95fba51ee9bba9767b25c999bd3de9ebd94 100644
(file)
--- a/
merge-base.c
+++ b/
merge-base.c
@@
-15,7
+15,7
@@
static struct commit *process_list(struct commit_list **list_p, int this_mark,
return NULL;
}
-struct commit *common_ancestor(struct commit *rev1, struct commit *rev2)
+st
atic st
ruct commit *common_ancestor(struct commit *rev1, struct commit *rev2)
{
struct commit_list *rev1list = NULL;
struct commit_list *rev2list = NULL;