Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Teach fast-import how to clear the internal branch content.
[gitweb.git]
/
diff.h
diff --git
a/diff.h
b/diff.h
index eff445596d98e46d40dd37843e690de27c5fabf1..7a347cf77d448817014ceeaed2d3cd99b5894ac6 100644
(file)
--- a/
diff.h
+++ b/
diff.h
@@
-144,7
+144,9
@@
extern void diff_change(struct diff_options *,
const char *base, const char *path);
extern void diff_unmerge(struct diff_options *,
- const char *path);
+ const char *path,
+ unsigned mode,
+ const unsigned char *sha1);
extern int diff_scoreopt_parse(const char *opt);