On Thu, Jun 12, 2014 at 09:25:54PM +0200, René Scharfe wrote:
> 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!
--
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