summaryrefslogtreecommitdiff
path: root/xdiff/xmerge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-04-06 00:48:49 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-04-06 00:56:27 -0700
commit1a7b1f6b9c9a129236c66c392877e8697825470f (patch)
tree78ec94449d735669a47ee45f7ab7188b3d8e2f4e /xdiff/xmerge.c
parentpatch-ids: use the new generic "sha1_pos" function to lookup sha1 (diff)
downloadtgif-1a7b1f6b9c9a129236c66c392877e8697825470f.tar.xz
sha1-lookup: fix up the assertion message
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions