git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 01/14] doc/merge-config: list ecmerge as a built-in merge tool

From
David Aguilar <davvid@gmail.com>
Date
Apr 6, 2009, 08:31 UTC
Message-ID
<1239006689-14695-2-git-send-email-davvid@gmail.com>
In-Reply-To
<1239006689-14695-1-git-send-email-davvid@gmail.com>
From: Markus Heidelberg <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.414.g81aa9
Previous: David AguilarNext: David Aguilar
Message 2 of 17 in “git-{merge,diff}tool refactor round three”
  1. David AguilarApr 6, 2009
  2. 01/14 doc/merge-config: list ecmerge as a built-in merge toolDavid Aguilar, Apr 6, 2009
  3. 02/14 git-mergetool/difftool: make (g)vimdiff workable under WindowsDavid Aguilar, Apr 6, 2009
  4. 03/14 git-mergetool: add new merge tool TortoiseMergeDavid Aguilar, Apr 6, 2009
  5. 04/14 difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiffDavid Aguilar, Apr 6, 2009
  6. 05/14 difftool: remove the backup file featureDavid Aguilar, Apr 6, 2009
  7. 06/14 difftool: use perl built-ins when testing for msysDavid Aguilar, Apr 6, 2009
  8. 07/14 difftool: add a -y shortcut for --no-promptDavid Aguilar, Apr 6, 2009
  9. 08/14 difftool/mergetool: add diffuse as merge and diff toolDavid Aguilar, Apr 6, 2009
  10. 09/14 difftool: move 'git-difftool' out of contribDavid Aguilar, Apr 6, 2009
  11. 10/14 difftool: add various git-difftool testsDavid Aguilar, Apr 6, 2009
  12. 11/14 difftool: add support for a difftool.prompt config variableDavid Aguilar, Apr 6, 2009
  13. 12/14 bash completion: add git-difftoolDavid Aguilar, Apr 6, 2009
  14. 13/14 mergetool: use $( ... ) instead of `backticks`David Aguilar, Apr 6, 2009
  15. 14/14 difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar, Apr 6, 2009
  16. Markus HeidelbergApr 6, 2009
  17. Markus HeidelbergApr 6, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.