diff options
Diffstat (limited to 'mergetools/diffmerge')
| -rw-r--r-- | mergetools/diffmerge | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mergetools/diffmerge b/mergetools/diffmerge index f138cb4e73..9b6355b98a 100644 --- a/mergetools/diffmerge +++ b/mergetools/diffmerge @@ -12,3 +12,7 @@ merge_cmd () { --result="$MERGED" "$LOCAL" "$REMOTE" fi } + +exit_code_trustable () { + true +} |