bash completion: Add '--merge' long option for 'git log'
bash completion: Add '--merge' long option for 'git log'

Signed-off-by: Lee Marlow <c895bdfdd1bf99084d7efdbd77c43126cd4b21a6@gmail.com>
Acked-by: Shawn O. Pearce <f01032651c12a22b2103346ba96b3b6b231f9d3c@spearce.org>
Signed-off-by: Junio C Hamano <a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com>

destenson/git,destenson/git,destenson/git,destenson/git,destenson/git,destenson/git,destenson/git,destenson/git