completion: --edit and --no-edit for git-merge
authorAdrian Weimann <adrian.weimann@googlemail.com>
Mon, 30 Jan 2012 19:29:33 +0000 (20:29 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Jan 2012 20:19:06 +0000 (12:19 -0800)
commitaad070922157d3249af7095ecff6ebc074c13bb9
treec86e944e318d3a16b182d54f62dd6c58931cbd7c
parent85da4d459bd6fe11189a2ccf560c952b31ed67b2
completion: --edit and --no-edit for git-merge

Signed-off-by: Adrian Weimann <adrian.weimann@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/completion/git-completion.bash