From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Sep 2021 18:42:34 +0000 (-0700)
Subject: Merge branch 'ab/retire-option-argument' into da/difftool
X-Git-Tag: v2.34.0-rc0~71^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=93a8ed28ea29fe1b5691e3e3d93a1870df717ac0;p=thirdparty%2Fgit.git

Merge branch 'ab/retire-option-argument' into da/difftool

* 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()
---

93a8ed28ea29fe1b5691e3e3d93a1870df717ac0