[PATCH 2/3] _git: add merge.conflictstyle option

[Hannu Koivisto <azure@iki.fi>]

---
 Completion/Unix/Command/_git |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 96e3284..f2022c7 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -3290,6 +3290,7 @@ __git_config_name () {
       'i18n.commitEncoding:character encoding commit messages are stored in'
       'i18n.logOutputEncoding:character encoding commit messages are output in'
       'log.showroot:whether to show initial commit as a diff against an empty tree or not'
+      'merge.conflictstyle:the style in which conflicted hunks are written'
       'merge.log:whether to include summaries of merged commits'
       'merge.tool:tool to use for merges (by git-mergetool)'
       'merge.verbosity:amount of output shown by recursive merge strategy'
@@ -3739,6 +3740,15 @@ __git_config_values () {
 
       _describe -t booleans 'boolean' booleans
       ;;
+    ((#i)merge.conflictstyle)
+      declare -a conflictstyles
+
+      conflictstyles=(
+        'merge:traditional RCS style (default)'
+        'diff3:also show the original text after ||||||| marker')
+
+      _describe -t conflict-styles 'conflict style' conflictstyles
+      ;;
     ((#i)merge.log)
       declare -a booleans
 
-- 
1.6.6.GIT