summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Brandon Williams <bmwill@google.com>2017-05-30 10:31:01 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-06-05 11:23:58 +0900
commit4d77896eeba6727e9a9fac9d78a8d7695737b772 (patch)
treedf05c6f670cc4ee34839366e5cd138366321aff0 /merge-recursive.c
parentnotes-merge: convert find_notes_merge_pair_ps to struct object_id (diff)
downloadtgif-4d77896eeba6727e9a9fac9d78a8d7695737b772.tar.xz
notes-merge: convert verify_notes_filepair to struct object_id
Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions