summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-22 15:55:55 -0700
committerJunio C Hamano <gitster@pobox.com>2011-04-23 22:34:43 -0700
commit76399c0195278ed2b52716b821cf064f77131736 (patch)
tree87223414f3e8afc3214a955174a1041d25216f00 /diff.h
parent3749fde561ad495dea74b0d3a13bba571068396d (diff)
downloadgit-76399c0195278ed2b52716b821cf064f77131736.tar.gz
diff.c: return filepair from diff_unmerge()
The underlying diff_queue() returns diff_filepair so that the caller can further add information to it, and the helper function diff_unmerge() utilizes the feature itself, but does not expose it to its callers, which was kind of selfish. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.h b/diff.h
index bf2f44d840..f51a8ee1b2 100644
--- 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);