From: Shawn O. Pearce Date: Fri, 22 Aug 2008 23:03:46 GMT Subject: Re: [PATCH] Revert "Convert output messages in merge-recursive to past tense." Message-ID: <20080822230346.GN3483@spearce.org> In-Reply-To: <7v7ia87k2e.fsf@gitster.siamese.dyndns.org> Junio C Hamano wrote: > Jonathan del Strother 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 -- Shawn.