Merge branch 'js/builtin-rebase-perf-fix-err-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 11:39:01 +0000 (20:39 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 11:39:01 +0000 (20:39 +0900)
The object name of the tree reported in a recently added error
message was wrong, which has been corrected.

* js/builtin-rebase-perf-fix-err-fix:
  rebase: warn about the correct tree's OID

1  2 
builtin/rebase.c

Simple merge