diff options
| author | Stefan Beller <stefanbeller@googlemail.com> | 2013-08-03 13:51:19 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-05 11:32:19 -0700 |
| commit | d5d09d475440c24016ec52a0bcc8477d9a7b5c71 (patch) | |
| tree | a6758a688f3308d4dc4ff75885fe7ce8792c9921 /builtin/merge-file.c | |
| parent | 4741edd549decfccc016fa4775b349fe94fdf4e5 (diff) | |
| download | git-d5d09d475440c24016ec52a0bcc8477d9a7b5c71.tar.gz git-d5d09d475440c24016ec52a0bcc8477d9a7b5c71.tar.xz | |
Replace deprecated OPT_BOOLEAN by OPT_BOOL
This task emerged from b04ba2bb (parse-options: deprecate OPT_BOOLEAN,
2011-09-27). All occurrences of the respective variables have
been reviewed and none of them relied on the counting up mechanism,
but all of them were using the variable as a true boolean.
This patch does not change semantics of any command intentionally.
Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
| -rw-r--r-- | builtin/merge-file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge-file.c b/builtin/merge-file.c index c0570f240..844f84f40 100644 --- a/builtin/merge-file.c +++ b/builtin/merge-file.c @@ -30,7 +30,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix) int quiet = 0; int prefixlen = 0; struct option options[] = { - OPT_BOOLEAN('p', "stdout", &to_stdout, N_("send results to standard output")), + OPT_BOOL('p', "stdout", &to_stdout, N_("send results to standard output")), OPT_SET_INT(0, "diff3", &xmp.style, N_("use a diff3 based merge"), XDL_MERGE_DIFF3), OPT_SET_INT(0, "ours", &xmp.favor, N_("for conflicts, use our version"), XDL_MERGE_FAVOR_OURS), |