bash: Add completion for git diff --base --ours --theirs
bash: Add completion for git diff --base --ours --theirs

Signed-off-by: Teemu Likonen <3a260b142701c16004442b923e210eae8459a0aa@iki.fi>
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