merge-recursive: rename merge_options argument from 'o' to 'opt'
authorElijah Newren <newren@gmail.com>
Fri, 5 Apr 2019 15:00:13 +0000 (08:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Apr 2019 07:02:07 +0000 (16:02 +0900)
commit259ccb6...c324912ea18b151d9c236ac17610c2f5
treec8e5660...5d8cdd0e3a71a9be40e9bf2f5f0d3cb1copy hash to clipboard (tree)
parent5ec1e72...23735b5682389589b6bee774ae70fa49copy hash to clipboard (diff)
merge-recursive.c