diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-09-20 11:42:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-20 11:42:34 -0700 |
| commit | 93a8ed28ea29fe1b5691e3e3d93a1870df717ac0 (patch) | |
| tree | a8269751121fb4bba06d95cc1b30e9588bdfd3ac /merge-ort-wrappers.h | |
| parent | The sixth batch (diff) | |
| parent | parse-options API: remove OPTION_ARGUMENT feature (diff) | |
| download | tgif-93a8ed28ea29fe1b5691e3e3d93a1870df717ac0.tar.xz | |
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()
Diffstat (limited to 'merge-ort-wrappers.h')
0 files changed, 0 insertions, 0 deletions