summaryrefslogtreecommitdiff
path: root/mergetools/emerge
diff options
context:
space:
mode:
Diffstat (limited to 'mergetools/emerge')
-rw-r--r--mergetools/emerge4
1 files changed, 4 insertions, 0 deletions
diff --git a/mergetools/emerge b/mergetools/emerge
index 7b895fdb1f..d1ce513ff5 100644
--- a/mergetools/emerge
+++ b/mergetools/emerge
@@ -20,3 +20,7 @@ merge_cmd () {
translate_merge_tool_path() {
echo emacs
}
+
+exit_code_trustable () {
+ true
+}