diff options
Diffstat (limited to 'mergetools/diffmerge')
| -rw-r--r-- | mergetools/diffmerge | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mergetools/diffmerge b/mergetools/diffmerge index 85ac720157..9b6355b98a 100644 --- a/mergetools/diffmerge +++ b/mergetools/diffmerge @@ -11,5 +11,8 @@ merge_cmd () { "$merge_tool_path" --merge \ --result="$MERGED" "$LOCAL" "$REMOTE" fi - status=$? +} + +exit_code_trustable () { + true } |