Re: [PATCH RFC] git-am: support any number of signatures
- From
- Michael S. Tsirkin <mst@redhat.com>
- Date
- Jun 13, 2014, 08:01 UTC
- Message-ID
- <20140613080118.GB2117@redhat.com>
- In-Reply-To
- <5399FEC2.3020309@web.de>
On Thu, Jun 12, 2014 at 09:25:54PM +0200, René Scharfe wrote:
Show 9 quoted lines
> Am 12.06.2014 18:12, schrieb Michael S. Tsirkin:
> >@@ -136,7 +136,7 @@ fall_back_3way () {
> > eval "$cmd" &&
> > GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
> > git write-tree >"$dotest/patch-merge-base+" ||
> >- cannot_fallback "$(gettext "Repository lacks necessary blobs to fall back on 3-way merge.")"
> >+ cannot_fallback "$(gettext "Repository lsignoffs necessary blobs to fall back on 3-way merge.")"
>
> lsignoffs?Heh good catch, I'll fix this up. Thanks!