summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2017-05-30 17:31:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-05 02:23:58 (GMT)
commit02491b67f3e4218176f3e6fe25961f1a8afade50 (patch)
tree91cf4e11db867b9c89b3000ba8ed182bcfc6e733 /builtin/merge.c
parent0e72462fb403110461faa1b06369b5c989ded381 (diff)
downloadgit-02491b67f3e4218176f3e6fe25961f1a8afade50.zip
git-02491b67f3e4218176f3e6fe25961f1a8afade50.tar.gz
git-02491b67f3e4218176f3e6fe25961f1a8afade50.tar.bz2
diffcore-rename: use is_empty_blob_oid
Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions