From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 23 Sep 2021 20:44:48 +0000 (-0700)
Subject: Merge branch 'ab/retire-option-argument'
X-Git-Tag: v2.34.0-rc0~125
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e35107e7dde88a8d53a98773afbbbd23cd694ae;p=thirdparty%2Fgit.git

Merge branch 'ab/retire-option-argument'

An oddball OPTION_ARGUMENT feature has been removed from the
parse-options API.

* ab/retire-option-argument:
  parse-options API: remove OPTION_ARGUMENT feature
  difftool: use run_command() API in run_file_diff()
  difftool: prepare "diff" cmdline in cmd_difftool()
  difftool: prepare "struct child_process" in cmd_difftool()
---

0e35107e7dde88a8d53a98773afbbbd23cd694ae