merge-recursive: make "Auto-merging" comment show for other merges
authorElijah Newren <newren@gmail.com>
Thu, 19 Apr 2018 17:58:22 +0000 (10:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 07:11:00 +0000 (16:11 +0900)
commit05cf21e...a29d18eb6cdece25613c6b1b036872d0
tree43ee6a8...86c2086c87dc33bf4594999a0fe4e64acopy hash to clipboard (tree)
parent277292d...ae27993d36f35fdd8d561c369b1e0962copy hash to clipboard (diff)
merge-recursive.c