| commit | 4756c05741164a0889212f1e8151ff081b75bba2 | |
| author | David Aguilar <davvid@gmail.com> | |
| Wed, 15 Oct 2014 08:35:18 +0000 (15 01:35 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 15 Oct 2014 20:48:15 +0000 (15 13:48 -0700) | ||
| tree | 8734a811be833562a572e3b1b1853f6bc1f1f16f | treesnapshot (tar.gz zip) |
| parent | 74578618a0b0d291d214779748edfbafdecb4ae3 | commitdiff |
t7610-mergetool: add missing && and remove commented-out code
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7610-mergetool.sh | diffblobblamehistory |