OSDN Git Service
(root)
/
git-core
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
rerere: split conflict ID further
[git-core/git.git]
/
rerere.h
diff --git
a/rerere.h
b/rerere.h
index
ce545d0
..
faf5a23
100644
(file)
--- a/
rerere.h
+++ b/
rerere.h
@@
-15,8
+15,9
@@
struct pathspec;
*/
extern void *RERERE_RESOLVED;
+struct rerere_dir;
struct rerere_id {
-
char hex[41]
;
+
struct rerere_dir *collection
;
};
extern int setup_rerere(struct string_list *, int);