projects
/
platform
/
upstream
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Imported Upstream version 2.19.0
[platform/upstream/git.git]
/
resolve-undo.h
diff --git
a/resolve-undo.h
b/resolve-undo.h
index
8729190
..
fbe348e
100644
(file)
--- a/
resolve-undo.h
+++ b/
resolve-undo.h
@@
-1,6
+1,8
@@
#ifndef RESOLVE_UNDO_H
#define RESOLVE_UNDO_H
+#include "cache.h"
+
struct resolve_undo_info {
unsigned int mode[3];
struct object_id oid[3];