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