diff.c: return filepair from diff_unmerge()
commit76399c0195278ed2b52716b821cf064f77131736
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 Apr 2011 22:55:55 +0000 (22 15:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 24 Apr 2011 05:34:43 +0000 (23 22:34 -0700)
tree87223414f3e8afc3214a955174a1041d25216f00
parent3749fde561ad495dea74b0d3a13bba571068396d
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>
diff.c
diff.h