attempt-backport: enable 3-way merge for git am#117

phillipj merged 1 commit intonodejs:masternodejs/github-bot:masterfrom

phillipj:git-am-3wayphillipj/github-bot:git-am-3wayCopy head branch name to clipboard