diff options
Diffstat (limited to 'mergetools/kdiff3')
| -rw-r--r-- | mergetools/kdiff3 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mergetools/kdiff3 b/mergetools/kdiff3 index a30034f116..0264ed5b20 100644 --- a/mergetools/kdiff3 +++ b/mergetools/kdiff3 @@ -20,5 +20,8 @@ merge_cmd () { -o "$MERGED" "$LOCAL" "$REMOTE" \ >/dev/null 2>&1 fi - status=$? +} + +exit_code_trustable () { + true } |