From 95a6d965c556807a7aa16490f92f48b77bf8b6ce Mon Sep 17 00:00:00 2001
From: Øystein Walle <oystwa@gmail.com>
Date: Tue, 16 Sep 2014 10:28:11 +0200
Subject: 33180: _git: add missing --3way option

---
 Completion/Unix/Command/_git | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Completion')

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index fcfd3e151..c4e386b15 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -3986,6 +3986,7 @@ _git-apply () {
 
   _arguments -w -S -s \
     $apply_options \
+    '(--index --cached --reject)'{-3,--3way}'[fall back on 3-way merge if patch fails]' \
     '--stat[output diffstat for input (turns off "apply")]' \
     '--numstat[same as --stat but in decimal notation and complete pathnames (turns off "apply")]' \
     '--summary[output summary of git-diff extended headers (turns off "apply")]' \
-- 
cgit 1.4.1