Sergey Organov fd16a39944 diff-merges: rename "combined_imply_patch" to "merges_imply_patch" ...

This is refactoring change in preparation for the next commit that
will let -m imply -p.

The old name doesn't match the intention to let not only -c/-cc imply
-p, but also -m, that is not a "combined" format, so we rename the
flag accordingly.

Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2021-05-21 09:24:14 +09:00

13 KiB

Raw Blame History

View Raw