diff options
Diffstat (limited to 'third_party/git/mergetools/diffmerge')
| -rw-r--r-- | third_party/git/mergetools/diffmerge | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/third_party/git/mergetools/diffmerge b/third_party/git/mergetools/diffmerge deleted file mode 100644 index 9b6355b98a..0000000000 --- a/third_party/git/mergetools/diffmerge +++ /dev/null @@ -1,18 +0,0 @@ -diff_cmd () { - "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1 -} - -merge_cmd () { - if $base_present - then - "$merge_tool_path" --merge --result="$MERGED" \ - "$LOCAL" "$BASE" "$REMOTE" - else - "$merge_tool_path" --merge \ - --result="$MERGED" "$LOCAL" "$REMOTE" - fi -} - -exit_code_trustable () { - true -} |