t4209: use helper functions to test --grep

diff --git a/merge-recursive.c b/merge-recursive.c
index a18bd15dd3dcf303909b4b541f35815705a3f50b..8400a8e937d8303ecc2ace1136a0700187865f58 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -693,7 +693,7 @@ static int make_room_for_path(struct merge_options *o, const char *path)
        /* Make sure leading directories are created */
        status = safe_create_leading_directories_const(path);
        if (status) {
-               if (status == -3) {
+               if (status == SCLD_EXISTS) {
                        /* something else exists */
                        error(msg, path, _(": perhaps a D/F conflict?"));
                        return -1;