Code

Merge branch 'en/merge-recursive' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 21:59:03 +0000 (13:59 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 21:59:03 +0000 (13:59 -0800)
* en/merge-recursive:
  t6022: Use -eq not = to test output of wc -l

1  2 
t/t6022-merge-rename.sh

Simple merge