| commit | 45de31d031f1fa071823f3c8ec7529176987ffa0 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 27 Jul 2014 22:23:56 +0000 (27 15:23 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 27 Jul 2014 22:23:56 +0000 (27 15:23 -0700) | ||
| tree | b82dcfac739710c7e1c46275e95f7b7f5f8db233 | treesnapshot (tar.gz zip) |
| parent | 321a77c3a5a65daacf95dd84fd9fc039b04d2a51 | commitdiff |
| parent | e832f7374b66d6d8a25eaab31f87c1ab3cc2d207 | commitdiff |
Merge branch 'ep/avoid-test-a-o' into next
* ep/avoid-test-a-o:
t9814: fix misconversion from test $a -o $b to test $a || test $b
* ep/avoid-test-a-o:
t9814: fix misconversion from test $a -o $b to test $a || test $b