Merge branch 'for-junio' of git://repo.or.cz/git/mingw/j6t
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Mar 2009 22:08:09 +0000 (15:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Mar 2009 22:08:09 +0000 (15:08 -0700)
* 'for-junio' of git://repo.or.cz/git/mingw/j6t:
  t7502-commit: Skip SIGTERM test on Windows
  t7005-editor: Use $SHELL_PATH in the editor scripts

1  2 
t/test-lib.sh

diff --cc t/test-lib.sh
Simple merge