From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 22 Aug 2008 22:37:29 GMT
Subject: Re: [PATCH] Revert "Convert output messages in merge-recursive to past tense."
Message-ID: <7v7ia87k2e.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <1219425524-77545-1-git-send-email-maillist@steelskies.com>

Jonathan del Strother <maillist@steelskies.com> 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.

Sign-off?

The patch looked Ok to me.  Shawn?