Merge branch 'es/adjust-subtree-test-for-merge-msg-update'
authorJunio C Hamano <redacted>
Mon, 10 Aug 2020 17:24:01 +0000 (10:24 -0700)
committerJunio C Hamano <redacted>
Mon, 10 Aug 2020 17:24:01 +0000 (10:24 -0700)
commit83b8250904d3c5e6107a70c27759e91160e139b0
tree808c0cda4265dadbb3b2cdb6f971ed09f0226772
parent7d7f4e3a3e64440dd38aa7da2d871813ae57eab7
parentb87528c4d7b0a28430da405f8f4b18f2fb8b953b
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"
git clone https://git.99rst.org/PROJECT