Re: [RFC/PATCH] Fix t7601-merge-pull-config.sh on AIX
- From
Brian Gernhardt <benji@silverinsanity.com>
- Date
- Jul 6, 2008, 08:15 UTC
- Message-ID
- <F378B75D-AC1B-4AA6-9DBD-616568DBADA4@silverinsanity.com>
- In-Reply-To
- <1215267838-19402-1-git-send-email-vmiklos@frugalware.org>
On Jul 5, 2008, at 10:23 AM, Miklos Vajna wrote:
> The test failed on AIX (and likely other OS, such as apparently OSX) > where wc -l outputs whitespace.
ACK. This test does break on OS X and this patch fixes it.
Took me a while to realize why it was saying "8: command not found". Apparently "resolve_count= 8" means something very different than "resolve_count=8". Then I remembered seeing a patch recently that hit conflict_count and I didn't have to think about how to fix it.
Thanks, ~~ Brian