On Thu, Oct 20, 2016 at 07:53:37AM -0400, Russell Bryant wrote:
> Thanks for taking a look and for the "git am -3" tip. I'll proceed with
> what you've already posted for now.
"git am -3" is like magic. I don't know why it isn't the default.