add merge-branch-into-current function
Some tweaking to vimrc
gnrt alias