From: Rikard Falkeborn <rikard.falkeborn@gmail.com>
Date: Sat, 27 May 2017 06:25:49 +0000 (+0200)
Subject: completion: add git config am.threeWay completion
X-Git-Tag: v2.14.0-rc0~96^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e8dec567705ebeaaff70bb29bd9f724944c5ae90?ds=inline;hp=-c

completion: add git config am.threeWay completion

Signed-off-by: Rikard Falkeborn <rikard.falkeborn@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

e8dec567705ebeaaff70bb29bd9f724944c5ae90
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 3e6ddaa814..6150790387 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2343,6 +2343,7 @@ _git_config ()
 		advice.statusHints
 		alias.
 		am.keepcr
+		am.threeWay
 		apply.ignorewhitespace
 		apply.whitespace
 		branch.autosetupmerge