completion: add missing options for git-merge
authorJohn Keeping <john@keeping.me.uk>
Thu, 22 May 2014 13:58:38 +0000 (14:58 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 May 2014 19:27:50 +0000 (12:27 -0700)
commit8fee872...470bd63db6c396ea6208ea487eaa8fab
tree725190b...7e313793c1c7762c56b6eb8860f94ffccopy hash to clipboard (tree)
parent6d2b06f...2b9c69351a55a2cad0cfab33ecb6ee6fcopy hash to clipboard (diff)
contrib/completion/git-completion.bash