Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
merge-recursive: Save D/F conflict filenames instead of unlinking them
[gitweb.git]
/
replace_object.c
diff --git
a/replace_object.c
b/replace_object.c
index eb59604fd39e2beaf7d43802499c27305ac92132..7c6c7544ada4585e62341f0c0854a919f10c2277 100644
(file)
--- a/
replace_object.c
+++ b/
replace_object.c
@@
-1,6
+1,7
@@
#include "cache.h"
#include "sha1-lookup.h"
#include "refs.h"
+#include "commit.h"
static struct replace_object {
unsigned char sha1[2][20];