Merge branch 'js/merge-tree-3-trees'

"git merge-tree" has learned that the three trees involved in the
3-way merge only need to be trees, not necessarily commits.

* js/merge-tree-3-trees:
  fill_tree_descriptor(): mark error message for translation
  cache-tree: avoid an unnecessary check
  Always check `parse_tree*()`'s return value
  t4301: verify that merge-tree fails on missing blob objects
  merge-ort: do check `parse_tree()`'s return value
  merge-tree: fail with a non-zero exit code on missing tree objects
  merge-tree: accept 3 trees as arguments

diff --cc builtin/checkout.c
Simple merge

diff --cc builtin/clone.c
Simple merge

diff --cc builtin/commit.c
Simple merge

diff --cc builtin/merge-tree.c
Simple merge

diff --cc builtin/read-tree.c
Simple merge

diff --cc builtin/reset.c
Simple merge

diff --cc cache-tree.c
Simple merge

diff --cc merge-ort.c
Simple merge

diff --cc merge-recursive.c
Simple merge

diff --cc merge.c
Simple merge

diff --cc reset.c
Simple merge

diff --cc sequencer.c
Simple merge

diff --cc t/t4301-merge-tree-write-tree.sh
Simple merge

diff --cc t/t6030-bisect-porcelain.sh
Simple merge