diff options
Diffstat (limited to 'third_party/git/mergetools/examdiff')
| -rw-r--r-- | third_party/git/mergetools/examdiff | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/third_party/git/mergetools/examdiff b/third_party/git/mergetools/examdiff deleted file mode 100644 index e72b06fc4d8f..000000000000 --- a/third_party/git/mergetools/examdiff +++ /dev/null @@ -1,16 +0,0 @@ -diff_cmd () { - "$merge_tool_path" "$LOCAL" "$REMOTE" -nh -} - -merge_cmd () { - if $base_present - then - "$merge_tool_path" -merge "$LOCAL" "$BASE" "$REMOTE" -o:"$MERGED" -nh - else - "$merge_tool_path" -merge "$LOCAL" "$REMOTE" -o:"$MERGED" -nh - fi -} - -translate_merge_tool_path() { - mergetool_find_win32_cmd "ExamDiff.com" "ExamDiff Pro" -} |