summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar brian m. carlson <sandals@crustytoothpaste.net>2018-03-12 02:27:29 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-03-14 09:23:48 -0700
commit40f5555ca331fa7855406c674cb60b087e5dfc1a (patch)
treed41e0da659d9bf1b7a583b3d3b3cf2cd8874a23e /builtin/merge-recursive.c
parentstrbuf: convert strbuf_add_unique_abbrev to use struct object_id (diff)
downloadtgif-40f5555ca331fa7855406c674cb60b087e5dfc1a.tar.xz
wt-status: convert struct wt_status_state to object_id
Convert the various *_sha1 members to use struct object_id instead. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions