snoopycrimecop/snoopycrimecop — pull request #1 by sbesson (2012-10-31 15:57:49+00:00)
Title: Improve token and merge()

- Use `git config --get github.token` to get the token
- Allow merge() to recover from merge conflict
- Log the merged and conflicting PRs