fixed indents, added gm for git branch -m {merge}