Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx>
---
builtin/merge-file.c | 2 +-
xdiff/xmerge.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin/merge-file.c b/builtin/merge-file.c
index 0186f4156a..6affccaf19 100644
--- a/builtin/merge-file.c
+++ b/builtin/merge-file.c
@@ -51,7 +51,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
if (startup_info->have_repository) {
/* Read the configuration file */
git_config(git_xmerge_config, NULL);
- if (0 <= git_xmerge_style)
+ if (git_xmerge_style >= 0)
xmp.style = git_xmerge_style;
}
diff --git a/xdiff/xmerge.c b/xdiff/xmerge.c
index 1659edb453..ab3448ca88 100644
--- a/xdiff/xmerge.c
+++ b/xdiff/xmerge.c
@@ -487,7 +487,7 @@ static int xdl_do_merge(xdfenv_t *xe1, xdchange_t *xscr1,
* "diff3 -m" output does not make sense for anything
* more aggressive than XDL_MERGE_EAGER.
*/
- if (XDL_MERGE_EAGER < level)
+ if (level > XDL_MERGE_EAGER)
level = XDL_MERGE_EAGER;
}
@@ -603,10 +603,10 @@ static int xdl_do_merge(xdfenv_t *xe1, xdchange_t *xscr1,
if (!changes)
changes = c;
/* refine conflicts */
- if (XDL_MERGE_ZEALOUS <= level &&
+ if (level >= XDL_MERGE_ZEALOUS &&
(xdl_refine_conflicts(xe1, xe2, changes, xpp) < 0 ||
xdl_simplify_non_conflicts(xe1, changes,
- XDL_MERGE_ZEALOUS < level) < 0)) {
+ level > XDL_MERGE_ZEALOUS) < 0)) {
xdl_cleanup_merge(changes);
return -1;
}
--
2.32.0
