* [PATCH 2/3] _git: add merge.conflictstyle option
@ 2010-04-05 17:43 Hannu Koivisto
0 siblings, 0 replies; only message in thread
From: Hannu Koivisto @ 2010-04-05 17:43 UTC (permalink / raw)
To: zsh-workers
---
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-04-06 21:33 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-04-05 17:43 [PATCH 2/3] _git: add merge.conflictstyle option Hannu Koivisto
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).