summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2017-05-30 17:31:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-05 02:23:58 (GMT)
commit94e327e973d320abf91c22307b87292911643c3b (patch)
tree953d034959c22384978993fe82ba70c41454708e /builtin/merge.c
parent02491b67f3e4218176f3e6fe25961f1a8afade50 (diff)
downloadgit-94e327e973d320abf91c22307b87292911643c3b.zip
git-94e327e973d320abf91c22307b87292911643c3b.tar.gz
git-94e327e973d320abf91c22307b87292911643c3b.tar.bz2
diff: rename diff_fill_sha1_info to diff_fill_oid_info
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