From: Junio C Hamano Date: Wed, 22 Sep 2010 16:35:59 +0000 (-0700) Subject: Merge branch 'jf/merge-ignore-ws' into next X-Git-Tag: ko-next~218 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5161fb89bfd9d102774a41233afdf192087bdb46;p=git.git Merge branch 'jf/merge-ignore-ws' into next * jf/merge-ignore-ws: merge-recursive: options to ignore whitespace changes merge-recursive --patience ll-merge: replace flag argument with options struct merge-recursive: expose merge options for builtin merge --- 5161fb89bfd9d102774a41233afdf192087bdb46 diff --cc builtin/merge-recursive.c index 78b9db76a,70e1d258f..c33091b3e --- a/builtin/merge-recursive.c +++ b/builtin/merge-recursive.c @@@ -2,10 -2,8 +2,11 @@@ #include "commit.h" #include "tag.h" #include "merge-recursive.h" + #include "xdiff-interface.h" +static const char builtin_merge_recursive_usage[] = + "git %s ... -- ..."; + static const char *better_branch_name(const char *branch) { static char githead_env[8 + 40 + 1];