diff.c: return filepair from diff_unmerge()

diff --git a/diff.h b/diff.h
index bf2f44d840735684c89f654ee6f3b3a935af2c55..f51a8ee1b2a159814ce7fcca699b9895365ab2ff 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -209,7 +209,7 @@ extern void diff_change(struct diff_options *,
                        const char *fullpath,
                        unsigned dirty_submodule1, unsigned dirty_submodule2);
 
-extern void diff_unmerge(struct diff_options *,
+extern struct diff_filepair *diff_unmerge(struct diff_options *,
                         const char *path,
                         unsigned mode,
                         const unsigned char *sha1);