--- Junio C Hamano <junkio@xxxxxxx> wrote:
> Luben Tuikov <ltuikov@xxxxxxxxx> writes:
>
> >> If you rely on MERGE_MSG then you would need to clean it after
> >> commit is done. Currently it does not and checks MERGE_HEAD,
> >> and cleans up MERGE_HEAD when it is done. MERGE_MSG is not
> >> cleaned.
> >
> > It is cleaned in the lines of the patch you deleted, the section
> > just after the "elif" above:
>
> Ok, so I can apply that original one with your 'Oops' rolled
> into one patch?
Yes please.
Luben
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html