From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Oct 2017 04:29:19 +0000 (+0900)
Subject: Merge branch 'js/rebase-i-final'
X-Git-Tag: v2.15.0-rc2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d1114d87c73c78a936975bef5f15e2cde639336d;p=thirdparty%2Fgit.git

Merge branch 'js/rebase-i-final'

Error message fix.

* js/rebase-i-final:
  sequencer.c: fix and unify error messages in rearrange_squash()
---

d1114d87c73c78a936975bef5f15e2cde639336d