Merge branch 'js/rebase-i-final'
commitd1114d87c73c78a936975bef5f15e2cde639336d
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Oct 2017 04:29:19 +0000 (17 13:29 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Oct 2017 04:29:19 +0000 (17 13:29 +0900)
treedd9a4e313f8d61c55940281a4a13db5fdf4a9bec
parent4339c9f2dfa7d8e100e83876f5f8c6da0dd4e179
parent3247edbb1a8218f9c65f09a25d46572b224d096b
Merge branch 'js/rebase-i-final'

Error message fix.

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