Merge branch 'ab/retire-option-argument' into da/difftool
commit93a8ed28ea29fe1b5691e3e3d93a1870df717ac0
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Sep 2021 18:42:34 +0000 (20 11:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Sep 2021 18:42:34 +0000 (20 11:42 -0700)
treea8269751121fb4bba06d95cc1b30e9588bdfd3ac
parent4c719308ce59dc70e606f910f40801f2c6051b24
parent4c25356e0edaa92e21aadb67579a0263019fbdc4
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()