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, 6 Feb 2012 08:00:54 +0000 (00:00 -0800)
Signed-off-by: Adrian Weimann <adrian.weimann@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found