From: Markus Heidelberg <markus.heidelberg@web.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, msysgit@googlegroups.com,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
David Aguilar <davvid@gmail.com>,
Charles Bailey <charles@hashpling.org>
Subject: [PATCH 1/3] doc/merge-config: list ecmerge as a built-in merge tool
Date: Sun, 5 Apr 2009 14:42:27 +0200 [thread overview]
Message-ID: <200904051442.27683.markus.heidelberg@web.de> (raw)
In-Reply-To: <200904051440.33154.markus.heidelberg@web.de>
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
---
Documentation/merge-config.txt | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 1ff08ff..9c44af8 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -22,7 +22,8 @@ merge.stat::
merge.tool::
Controls which merge resolution program is used by
linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3",
- "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and
+ "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff",
+ "ecmerge" and
"opendiff". Any other value is treated is custom merge tool
and there must be a corresponding mergetool.<tool>.cmd option.
--
1.6.2.2.460.g49e5c
next prev parent reply other threads:[~2009-04-05 12:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-05 12:40 [PATCH 0/3] git-mergetool/difftool: TortoiseMerge and (g)vimdiff for Windows Markus Heidelberg
2009-04-05 12:42 ` Markus Heidelberg [this message]
2009-04-05 12:42 ` [PATCH 2/3] git-mergetool/difftool: make (g)vimdiff workable under Windows Markus Heidelberg
2009-04-05 12:43 ` [PATCH 3/3] git-mergetool: add new merge tool TortoiseMerge Markus Heidelberg
2009-04-05 13:52 ` [PATCH 0/3] git-mergetool/difftool: TortoiseMerge and (g)vimdiff for Windows Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200904051442.27683.markus.heidelberg@web.de \
--to=markus.heidelberg@web.de \
--cc=Johannes.Schindelin@gmx.de \
--cc=charles@hashpling.org \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=msysgit@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox