Added helpers for --ours and --theirs options for git checkout
Merge pull request #3 from gerardo-orozco/master

Added helpers for --ours and --theirs options for git checkout