Merge branch 'sg/t3600-nul-sha1-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 30 Oct 2013 19:10:09 +0000 (12:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 Oct 2013 19:10:09 +0000 (12:10 -0700)
* sg/t3600-nul-sha1-fix:
t3600: fix broken "choking git rm" test

1  2 
t/t3600-rm.sh
diff --cc t/t3600-rm.sh
Simple merge