Signed-off-by: Sebastian Schuberth <sschuberth@xxxxxxxxx>
---
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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html