diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-22T16·46+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-22T16·46+0100 |
| commit | 5229c9b232de5bfa959ad6ebbb4c8192ac513352 (patch) | |
| tree | 8539e7e23682cac110900f946f034ae44162cacd /third_party/git/range-diff.h | |
| parent | f2b211131f2347342dde63975b09cf603149f1a3 (diff) | |
| parent | 8518a7a51faaf50f830646d4c3585f51236b9349 (diff) | |
merge(3p/git): Merge git upstream at v2.26.2 r/808
Diffstat (limited to 'third_party/git/range-diff.h')
| -rw-r--r-- | third_party/git/range-diff.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/third_party/git/range-diff.h b/third_party/git/range-diff.h index 08a50b6e98..e11976dc81 100644 --- a/third_party/git/range-diff.h +++ b/third_party/git/range-diff.h @@ -2,16 +2,18 @@ #define RANGE_DIFF_H #include "diff.h" +#include "argv-array.h" #define RANGE_DIFF_CREATION_FACTOR_DEFAULT 60 /* - * Compare series of commmits in RANGE1 and RANGE2, and emit to the + * Compare series of commits in RANGE1 and RANGE2, and emit to the * standard output. NULL can be passed to DIFFOPT to use the built-in * default. */ int show_range_diff(const char *range1, const char *range2, int creation_factor, int dual_color, - struct diff_options *diffopt); + const struct diff_options *diffopt, + const struct argv_array *other_arg); #endif |