author | Junio C Hamano <gitster@pobox.com> | |
Wed, 17 Nov 2010 21:59:03 +0000 (13:59 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 17 Nov 2010 21:59:03 +0000 (13:59 -0800) | ||
commit | 1b6f8653746ec6d7daec2e0784452dffd8e22d36 | |
tree | 895195382ee41dcb31b5bd0b82ef6caa36381483 | tree | snapshot |
parent | bd58c4692fbc8c1794fe52fa856638f56fcca3ef | commit | diff |
parent | 9f6cea97c97ee505bd6771db7df69f04df9b4fc4 | commit | diff |
Merge branch 'en/merge-recursive' into next
* en/merge-recursive:
t6022: Use -eq not = to test output of wc -l
* en/merge-recursive:
t6022: Use -eq not = to test output of wc -l
t/t6022-merge-rename.sh | diff1 | | diff2 | | blob | history |