Code

completion: --edit and --no-edit for git-merge