summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorLibravatar Alex Riesen <raa.lkml@gmail.com>2008-04-27 13:31:23 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-04-29 23:11:57 -0700
commit97ad535b01f7c4e960298aabe16979ad92f26d4f (patch)
tree12743adc5db1debd1821050cc3e2cb61d0f4d8b3 /git-merge.sh
parentAdd otherwise missing --strict option to unpack-objects summary. (diff)
downloadtgif-97ad535b01f7c4e960298aabe16979ad92f26d4f.tar.xz
Use the modern syntax of git-diff-files in t2002-checkout-cache-u.sh
As a nice side effect it also fixes t2002-checkout-cache-u.sh on FreeBSD 4, /bin/sh of which has problems interpreting "! command" construction. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions