Re: [PATCH RFC] git-am: support any number of signatures
- From
René Scharfe <l.s.r@web.de>
- Date
- Jun 12, 2014, 19:25 UTC
- Message-ID
- <5399FEC2.3020309@web.de>
- In-Reply-To
- <1402589505-27632-1-git-send-email-mst@redhat.com>
Am 12.06.2014 18:12, schrieb Michael S. Tsirkin:
Show 6 quoted lines
> @@ -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?