this change does not work on mac, hopefully it would work on Ubuntu, otherwise, I have to use env export to realize my goals
set git merge option to auto edit
Merge branch 'master' of github.com:huangyingw/root
merge into one line