Thread (6 messages) 6 messages, 2 authors, 2016-06-15

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

flat view
DORMANTno replies

From: Sebastian Schuberth <hidden>
Date: 2016-06-15 22:50:04
Subsystem: the rest · Maintainer: Linus Torvalds


Signed-off-by: Sebastian Schuberth <redacted>
---
 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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help