Reuse sockets to avoid socket already in use error
Make default editor vi
Merge commit 'HEAD@{2}'