summaryrefslogtreecommitdiff
path: root/xdiff/xmerge.c
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2011-05-09 09:33:30 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-09 15:26:27 -0700
commit838466b8f7f9e8752a14114d5c4b1d685e0c6c25 (patch)
treec37c188a840851dd5458cb7df85a72baf3678c0a /xdiff/xmerge.c
parentUpdate draft release notes to 1.7.6 (diff)
downloadtgif-838466b8f7f9e8752a14114d5c4b1d685e0c6c25.tar.xz
add tests for various blame formats
We don't seem to have any tests for "blame --porcelain". Let's at least do a trivial test on a simple example. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions