Junio C HamanoThis fixes a bug that was preventing non-default parameter to -B option to be passed correctly; you could not give more than 50% break score.
Signed-off-by: Junio C Hamano <junkio@cox.net> ---
diff.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
Show changes to diff.c +2 −2
diff --git a/diff.c b/diff.c --- a/diff.c +++ b/diff.c @@ -964,11 +964,11 @@ void diffcore_std(const char **paths, { if (paths && paths[0]) diffcore_pathspec(paths); - if (0 <= break_opt) + if (break_opt != -1) diffcore_break(break_opt); if (detect_rename) diffcore_rename(detect_rename, rename_score); - if (0 <= break_opt) + if (break_opt != -1) diffcore_merge_broken(); if (pickaxe) diffcore_pickaxe(pickaxe, pickaxe_opts); ------------