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
Feb 26, 2011, 10:53 UTC
Message-ID
<4D68DBB0.2020909@gmail.com>
In-Reply-To
<4D68DAC4.9060100@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 3ac6231..95da00b 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.6.dirty
Previous: Sebastian SchuberthNext: Chris Packham
Message 4 of 8 in “Adding Beyond Compare as a merge tool, was: Re: What's cooking in git.git (Feb 2011, #05; Wed, 23)”
  1. 0/3 Adding Beyond Compare as a merge tool, was: Re: What's cooking in git.git (Feb 2011, #05; Wed, 23)Sebastian Schuberth, Feb 26, 2011
  2. 1/3 mergetool--lib: Sort tools alphabetically for easier lookupSebastian Schuberth, Feb 26, 2011
  3. 2/3 mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth, Feb 26, 2011
  4. 3/3 mergetool--lib: Add the proper executable name for ECMergeSebastian Schuberth, Feb 26, 2011
  5. Chris PackhamFeb 27, 2011
  6. Sebastian SchuberthFeb 27, 2011
  7. Chris PackhamFeb 27, 2011
  8. Junio C HamanoFeb 27, 2011

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.