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)
commit1b6f8653746ec6d7daec2e0784452dffd8e22d36
tree895195382ee41dcb31b5bd0b82ef6caa36381483
parentbd58c4692fbc8c1794fe52fa856638f56fcca3ef
parent9f6cea97c97ee505bd6771db7df69f04df9b4fc4
Merge branch 'en/merge-recursive' into next

* en/merge-recursive:
  t6022: Use -eq not = to test output of wc -l
t/t6022-merge-rename.sh