Merge branch 'jc/fix-tree-walk' (early part)

* 'jc/fix-tree-walk' (early part):
unpack_callback(): use unpack_failed() consistently
unpack-trees: typofix
diff-lib.c: fix misleading comments on oneway_diff()

diff --cc unpack-trees.c
Simple merge