diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-05-08 14:25:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-08 14:25:12 -0700 |
| commit | 282ce92448e25cfbf1b399c9d33eb290f2331814 (patch) | |
| tree | e72d625d942ea8297f569fbb968464005c214439 /builtin/merge.c | |
| parent | Merge branch 'cb/t0000-use-the-configured-shell' (diff) | |
| parent | t/test_lib: avoid naked bash arrays in file_lineno (diff) | |
| download | tgif-282ce92448e25cfbf1b399c9d33eb290f2331814.tar.xz | |
Merge branch 'cb/test-bash-lineno-fix'
Recent change to show files and line numbers of a breakage during
test (only available when running the tests with bash) were hurting
other shells with syntax errors, which has been corrected.
* cb/test-bash-lineno-fix:
t/test_lib: avoid naked bash arrays in file_lineno
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions