Merge branch 'vs/submodule-clone-nested-submodules-alternates'

[git] / mergetools / emerge

diff --git a/mergetools/emerge b/mergetools/emerge
index 7b895fd..d1ce513 100644 (file)
--- a/mergetools/emerge
+++ b/mergetools/emerge
@@ -20,3 +20,7 @@ merge_cmd () {
 translate_merge_tool_path() {
        echo emacs
 }
+
+exit_code_trustable () {
+       true
+}