eXpand yOur cReativity

So, the scenario is: you’re in the middle of a merge, and you want to keep one file or the other.
$ git merge master
Auto-merged _layouts/default.html
CONFLICT (content): Merge conflict in _layouts/default.html
Auto-merged index.html
CONFLICT (content): Merge conflict in index.html
Automatic merge failed; fix conflicts and then commit the result.
There’s [...]