rm p4merge
Merge branch 'master' of github.com:nouh/dotfile