summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge.sh
diff options
context:
space:
mode:
authorLibravatar Clément Poulain <clement.poulain@ensimag.imag.fr>2010-06-09 19:02:09 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-06-18 12:57:47 -0700
commit34bb92eca4259b3db8cb9bfad5fcac4ff2be139b (patch)
tree3065d577f97908e3774933fa292c9c9c814efa94 /contrib/examples/git-merge.sh
parenttextconv: support for cat_file (diff)
downloadtgif-34bb92eca4259b3db8cb9bfad5fcac4ff2be139b.tar.xz
t/t8007: test textconv support for cat-file
Test the correct functionning of textconv with cat-file <sha1:blob> and cat-file HEAD^ <file>. Test the case when no driver is specified Signed-off-by: Clément Poulain <clement.poulain@ensimag.imag.fr> Signed-off-by: Diane Gasselin <diane.gasselin@ensimag.imag.fr> Signed-off-by: Axel Bonnet <axel.bonnet@ensimag.imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/examples/git-merge.sh')
0 files changed, 0 insertions, 0 deletions