diff options
Diffstat (limited to 'third_party/git/mergetools/diffuse')
| -rw-r--r-- | third_party/git/mergetools/diffuse | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/third_party/git/mergetools/diffuse b/third_party/git/mergetools/diffuse deleted file mode 100644 index 5a3ae8b5695d..000000000000 --- a/third_party/git/mergetools/diffuse +++ /dev/null @@ -1,15 +0,0 @@ -diff_cmd () { - "$merge_tool_path" "$LOCAL" "$REMOTE" | cat -} - -merge_cmd () { - if $base_present - then - "$merge_tool_path" \ - "$LOCAL" "$MERGED" "$REMOTE" \ - "$BASE" | cat - else - "$merge_tool_path" \ - "$LOCAL" "$MERGED" "$REMOTE" | cat - fi -} |