diff options
| author | Elijah Newren <newren@gmail.com> | 2019-08-17 11:41:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-19 10:08:04 -0700 |
| commit | c749ab1da812cdb1263f868c63fe1808a12dcff2 (patch) | |
| tree | c848d5d62cc04ef8f5807ae50874b801a9e309de /commit.c | |
| parent | merge-recursive: rename 'mrtree' to 'result_tree', for clarity (diff) | |
| download | git-c749ab1da812cdb1263f868c63fe1808a12dcff2.tar.gz git-c749ab1da812cdb1263f868c63fe1808a12dcff2.zip | |
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>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions