projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7b9c0a6) | patch
Fix t7601-merge-pull-config.sh on AIX
authorMiklos Vajna <vmiklos@frugalware.org>
Sat, 5 Jul 2008 14:23:58 +0000 (16:23 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 Jul 2008 02:23:00 +0000 (19:23 -0700)
commit1c6669351a47c834cceb75d6044a1aae259fc69f
tree27950c2fef08c14a3410fc6691cf37aa9167397atree | snapshot
parent7b9c0a69a5f64fffb5de8b49a96f41ac35b4a84fcommit | 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>
t/t7601-merge-pull-config.sh diff | blob | history
Git—the stupid content tracker