X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff.h;h=7a347cf77d448817014ceeaed2d3cd99b5894ac6;hb=b6936205e73c058784288d21d1937e5bba26b91b;hp=eff445596d98e46d40dd37843e690de27c5fabf1;hpb=ebd124c6783da5e064963611ee17741cd173f6b5;p=git.git

diff --git a/diff.h b/diff.h
index eff445596..7a347cf77 100644
--- 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);