diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-04-22 15:55:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-23 22:34:43 -0700 |
| commit | 76399c0195278ed2b52716b821cf064f77131736 (patch) | |
| tree | 87223414f3e8afc3214a955174a1041d25216f00 /resolve-undo.c | |
| parent | test: use $_z40 from test-lib (diff) | |
| download | tgif-76399c0195278ed2b52716b821cf064f77131736.tar.xz | |
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 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions