]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.h
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bab5687) | patch
merge-recursive: rename merge_options argument to opt in header
authorElijah Newren <newren@gmail.com>
Sat, 17 Aug 2019 18:41:36 +0000 (11:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Aug 2019 17:08:04 +0000 (10:08 -0700)
commitc749ab1da812cdb1263f868c63fe1808a12dcff2
treec848d5d62cc04ef8f5807ae50874b801a9e309detree | snapshot
parentbab56877e04efcf1bf9154398131dd57d73725d4commit | diff
merge-recursive: rename merge_options argument to opt in header

In commit 259ccb6cc324 ("merge-recursive: rename merge_options argument
from 'o' to 'opt'", 2019-04-05), I renamed a bunch of function
arguments in merge-recursive.c, but forgot to make that same change to
merge-recursive.h.  Make the two match.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.h diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.