diff options
| author |  Jeff King <peff@peff.net> | 2013-04-04 20:08:47 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-04-04 20:33:19 -0700 |
| commit | 7cdb9b42c359000b1d3d604f847598afd015b7c7 (patch) | |
| tree | c720cffc16f054022ed37d3e2fbbd99b4fe94f25 /t/t3030-merge-recursive.sh | |
| parent | diffcore-pickaxe: remove unnecessary call to get_textconv() (diff) | |
| download | tgif-7cdb9b42c359000b1d3d604f847598afd015b7c7.tar.xz | |
diffcore-pickaxe: remove fill_one()
fill_one is _almost_ identical to just calling fill_textconv; the
exception is that for the !DIFF_FILE_VALID case, fill_textconv gives us
an empty buffer rather than a NULL one. Since we currently use the NULL
pointer as a signal that the file is not present on one side of the
diff, we must now switch to using DIFF_FILE_VALID to make the same
check.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Simon Ruderich <simon@ruderich.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3030-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions