summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Brandon Williams <bmwill@google.com>2017-05-30 10:31:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-06-05 11:23:58 +0900
commit9e5e0c289a900186b8943741cc632ea3bb6e1510 (patch)
tree0e36bca949828e7b7255a41f60f66767170c485c /merge-recursive.c
parentnotes-merge: convert verify_notes_filepair to struct object_id (diff)
downloadtgif-9e5e0c289a900186b8943741cc632ea3bb6e1510.tar.xz
notes-merge: convert write_note_to_worktree 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