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

[PATCH 3/3] mergetool--lib: Add the proper executable name for ECMerge

From
Sebastian Schuberth <sschuberth@gmail.com>
Date
Nov 18, 2010, 10:44 UTC
Message-ID
<4CE5038F.2040400@gmail.com>
In-Reply-To
<4CE50290.90600@gmail.com>
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
---
 git-mergetool--lib.sh |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 47049a6..58398bd 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -16,6 +16,9 @@ translate_merge_tool_path () {
 	bc3)
 		echo BCompare
 		;;
+	ecmerge)
+		echo guimerge
+		;;
 	emerge)
 		echo emacs
 		;;
-- 
1.7.3.2.msysgit.11
Previous: Sebastian SchuberthNext: Charles Bailey
Message 4 of 6 in “Improvements to mergetool-lib”
  1. 0/3 Improvements to mergetool-libSebastian Schuberth, Nov 18, 2010
  2. 1/3 mergetool--lib: Sort tools alphabetically for easier lookupSebastian Schuberth, Nov 18, 2010
  3. 2/3 mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth, Nov 18, 2010
  4. 3/3 mergetool--lib: Add the proper executable name for ECMergeSebastian Schuberth, Nov 18, 2010
  5. Charles BaileyNov 18, 2010
  6. Sebastian SchuberthNov 18, 2010

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.