diff options
Diffstat (limited to 'third_party/git/mergetools/codecompare')
| -rw-r--r-- | third_party/git/mergetools/codecompare | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/third_party/git/mergetools/codecompare b/third_party/git/mergetools/codecompare deleted file mode 100644 index 9f60e8da6527..000000000000 --- a/third_party/git/mergetools/codecompare +++ /dev/null @@ -1,23 +0,0 @@ -diff_cmd () { - "$merge_tool_path" "$LOCAL" "$REMOTE" -} - -merge_cmd () { - if $base_present - then - "$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" -BF="$BASE" \ - -RF="$MERGED" - else - "$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" \ - -RF="$MERGED" - fi -} - -translate_merge_tool_path() { - if merge_mode - then - echo CodeMerge - else - echo CodeCompare - fi -} |