Merge branch 'es/adjust-subtree-test-for-merge-msg-update'

Adjust tests in contrib/ to the recent change to fmt-merge-msg. * es/adjust-subtree-test-for-merge-msg-update: Revert "contrib: subtree: adjust test to change in fmt-merge-msg"

Junio C Hamano committed Aug 10, 2020 at 10:24 UTC 83b8250904d3c5e6107a70c27759e91160e139b0

No changes.