summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorBrian Gernhardt <brian@gernhardtsoftware.com>2010-11-08 16:29:26 -0500
committerJunio C Hamano <gitster@pobox.com>2010-11-17 13:50:20 -0800
commit9f6cea97c97ee505bd6771db7df69f04df9b4fc4 (patch)
tree279e7b592063185189bed522734770977ef421bc /merge-recursive.c
parentc8516500b1ee6025466a207cd86dc30421c3b6e6 (diff)
downloadgit-9f6cea97c97ee505bd6771db7df69f04df9b4fc4.tar.gz
t6022: Use -eq not = to test output of wc -l
When comparing numbers such as "3" to "$(wc -l)", we should check for numerical equality using -eq instead of string equality using = because some implementations of wc output extra whitespace. Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions