]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'es/adjust-subtree-test-for-merge-msg-update'
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Aug 2020 17:24:01 +0000 (10:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Aug 2020 17:24:01 +0000 (10:24 -0700)
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"


Trivial merge