diff options
| author | David Aguilar <davvid@gmail.com> | 2014-10-15 01:35:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-15 13:49:11 -0700 |
| commit | f9e43085bb95034a36a223f4eba75174b096179c (patch) | |
| tree | 5f8574cfe5f70ce6f430c2819bb48107d1c1ae22 /t/t4013/diff.diff_initial..side | |
| parent | t7610-mergetool: add missing && and remove commented-out code (diff) | |
| download | git-f9e43085bb95034a36a223f4eba75174b096179c.tar.gz git-f9e43085bb95034a36a223f4eba75174b096179c.zip | |
t7610-mergetool: prefer test_config over git config
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.diff_initial..side')
0 files changed, 0 insertions, 0 deletions