diff options
Diffstat (limited to 'third_party/git/mergetools/kdiff3')
| -rw-r--r-- | third_party/git/mergetools/kdiff3 | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/third_party/git/mergetools/kdiff3 b/third_party/git/mergetools/kdiff3 deleted file mode 100644 index 0264ed5b20..0000000000 --- a/third_party/git/mergetools/kdiff3 +++ /dev/null @@ -1,27 +0,0 @@ -diff_cmd () { - "$merge_tool_path" \ - --L1 "$MERGED (A)" --L2 "$MERGED (B)" \ - "$LOCAL" "$REMOTE" >/dev/null 2>&1 -} - -merge_cmd () { - if $base_present - then - "$merge_tool_path" --auto \ - --L1 "$MERGED (Base)" \ - --L2 "$MERGED (Local)" \ - --L3 "$MERGED (Remote)" \ - -o "$MERGED" "$BASE" "$LOCAL" "$REMOTE" \ - >/dev/null 2>&1 - else - "$merge_tool_path" --auto \ - --L1 "$MERGED (Local)" \ - --L2 "$MERGED (Remote)" \ - -o "$MERGED" "$LOCAL" "$REMOTE" \ - >/dev/null 2>&1 - fi -} - -exit_code_trustable () { - true -} |