completion: --edit and --no-edit for git-merge
commit2ff14e31bd8c91356d54b7bac064e7cc615e56b3
authorAdrian Weimann <adrian.weimann@googlemail.com>
Mon, 30 Jan 2012 19:29:33 +0000 (30 20:29 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Feb 2012 08:00:54 +0000 (6 00:00 -0800)
tree30f70c3c763ca031e1856cdf2c9c0ab336336292
parentf2120eb4db3e3e3f9a336eb04fdc2319d7421536
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