Message ID | 48200773a1bbe8467e37db637c99c85be2c809ec.1660806927.git.gitgitgadget@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 34ce504a33cca435b3fc689c3e2a0ae2f71d5a85 |
Headers | show |
Series | Fixups for cw/submodule-merge-messages | expand |
diff --git a/merge-ort.c b/merge-ort.c index 67159fc6ef9..8f14f1ad0b2 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -1767,7 +1767,7 @@ static int merge_submodule(struct merge_options *opt, int i; int search = !opt->priv->call_depth; int sub_not_initialized = 1; - int sub_flag = -1; + int sub_flag = CONFLICT_SUBMODULE_FAILED_TO_MERGE; /* store fallback answer in result in case we fail */ oidcpy(result, opt->priv->call_depth ? o : a);