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