diff options
Diffstat (limited to 'mergetools/kdiff3')
-rw-r--r-- | mergetools/kdiff3 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mergetools/kdiff3 b/mergetools/kdiff3 index 793d1293b1..0264ed5b20 100644 --- a/mergetools/kdiff3 +++ b/mergetools/kdiff3 @@ -21,3 +21,7 @@ merge_cmd () { >/dev/null 2>&1 fi } + +exit_code_trustable () { + true +} |