diff options
Diffstat (limited to 'mergetools/tkdiff')
| -rw-r--r-- | mergetools/tkdiff | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mergetools/tkdiff b/mergetools/tkdiff index 618c438e87..eee5cb57e3 100644 --- a/mergetools/tkdiff +++ b/mergetools/tkdiff @@ -10,3 +10,7 @@ merge_cmd () { "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE" fi } + +exit_code_trustable () { + true +} |