Junio C Hamano <gitster@xxxxxxxxx> wrote: > Jonathan del Strother <maillist@xxxxxxxxxxxxxx> writes: > > > Now that the progress meter is gone, merge messages make more sense when presented in present tense > > > > This reverts commit 89f40be294363ce4d14ed6931a65561a4e8e9140. > > > > Conflicts: > > > > builtin-merge-recursive.c > > --- > > "Conflicts:"? Please either remove it or describe how you resolved the > conflicts. The conflicts are likely because this was run with git-revert and a few hunks had to be manually merged. The result of the patch looks fine to me. But the "Conflicts" part of the message is likely not interesting here. > Sign-off? > > The patch looked Ok to me. Shawn? Acked-by: Shawn O. Pearce <spearce@xxxxxxxxxxx> -- Shawn. -- 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
