Mislav’s git shortcuts for resolving conflicts

via gist.github.com