tree 3fae73cf58ce54acec26cc52edf5dcfe653f345d
parent 86d87307c1c490282749e278380b9a258de0b46c
parent 7663e438c5ca5a1dbcfcb1a9cbf68480362998a2
author Junio C Hamano <gitster@pobox.com> 1560791715 -0700
committer Junio C Hamano <gitster@pobox.com> 1560791715 -0700

Merge branch 'jk/am-i-resolved-fix'

"git am -i --resolved" segfaulted after trying to see a commit as
if it were a tree, which has been corrected.

* jk/am-i-resolved-fix:
  am: fix --interactive HEAD tree resolution
  am: drop tty requirement for --interactive
  am: read interactive input from stdin
  am: simplify prompt response handling