Added .gitconfig mergenc (no commit) alias