aboutsummaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@uchicago.edu>2008-07-26 23:53:30 -0500
committerJunio C Hamano <gitster@pobox.com>2008-07-27 14:14:01 -0700
commitb890fa33a41c0976171d80590286d2bc8bda3df6 (patch)
tree3dff2bcb88a6c841d423b89fbc72cf91340f6bb9 /merge-file.c
parent77ef80a83e652d65a26213bc276b33051524998f (diff)
downloadgit-b890fa33a41c0976171d80590286d2bc8bda3df6.tar.gz
git-b890fa33a41c0976171d80590286d2bc8bda3df6.tar.xz
t6030 (bisect): work around Mac OS X "ls"
t6030-bisect-porcelain.sh relies on "ls" exiting with nonzero status when asked to list nonexistent files. Unfortunately, /bin/ls on Mac OS X 10.3 exits with exit code 0. So look at its output instead. Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu> Acked-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions