diff options
Diffstat (limited to 'third_party/git/mergetools/kompare')
| -rw-r--r-- | third_party/git/mergetools/kompare | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/third_party/git/mergetools/kompare b/third_party/git/mergetools/kompare deleted file mode 100644 index e8c0bfa67854..000000000000 --- a/third_party/git/mergetools/kompare +++ /dev/null @@ -1,11 +0,0 @@ -can_merge () { - return 1 -} - -diff_cmd () { - "$merge_tool_path" "$LOCAL" "$REMOTE" -} - -exit_code_trustable () { - true -} |