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