diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-06-04 15:39:50 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-06-04 15:39:50 +0300 |
commit | e66e8f9be8af90671b85a758b62610bd1162de2d (patch) | |
tree | 9e38a6b4a5b6a304f907e830f172cb2d791f0a51 /builtin/merge.c | |
parent | 01cbd9eab5710a409e2e760fa20aeb701fa5e799 (diff) | |
parent | 0c5a779c67d8c21579525e2a89c42b0fc7236a2b (diff) |
Merge branch 'bc/t3430-fixup'
Test fix.
* bc/t3430-fixup:
t3430: test clean-up
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions