diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-07-05 18:23:58 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-07 06:23:00 +0400 |
| commit | 1c6669351a47c834cceb75d6044a1aae259fc69f (patch) | |
| tree | 27950c2fef08c14a3410fc6691cf37aa9167397a /git-merge.sh | |
| parent | 7b9c0a69a5f64fffb5de8b49a96f41ac35b4a84f (diff) | |
Fix t7601-merge-pull-config.sh on AIX
The test failed on AIX (and likely other OS, such as apparently OSX)
where wc -l outputs whitespace.
Also, avoid unnecessary eval in conflict_count().
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions