diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-05-11 09:27:21 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-11 09:27:22 +0300 |
| commit | 8ca4771dd0889ce269780b5f2b48166ffaff9570 (patch) | |
| tree | 861682757107951cca2ef20e9649b85367101f06 /merge-recursive.c | |
| parent | 49f38e2de47a401fc2b0f4cce38e9f07fb63df48 (diff) | |
| parent | 4cd66e7d6b423d3c5b161b55afb07cb1df59e75f (diff) | |
Merge branch 'rj/bisect-skip-honor-terms'
"git bisect skip" when custom words are used for new/old did not
work, which has been corrected.
* rj/bisect-skip-honor-terms:
bisect--helper: use BISECT_TERMS in 'bisect skip' command
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions