From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21009 invoked by alias); 6 Apr 2010 21:33:23 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 27857 Received: (qmail 16721 invoked from network); 6 Apr 2010 21:33:11 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00,DATE_IN_PAST_24_48 autolearn=no version=3.3.1 Received-SPF: none (ns1.primenet.com.au: domain at iki.fi does not designate permitted sender hosts) From: Hannu Koivisto To: zsh-workers@zsh.org Subject: [PATCH 2/3] _git: add merge.conflictstyle option Date: Mon, 05 Apr 2010 20:43:34 +0300 User-Agent: Gnus/5.110011 (No Gnus v0.11) Emacs/23.1 (gnu/linux) Mail-copies-to: nobody Message-ID: <831vesfgri.fsf@kalahari.s2.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: azure@iki.fi X-SA-Exim-Scanned: No (on kalahari.s2.org); SAEximRunCond expanded to false --- 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