diff options
Diffstat (limited to 'third_party/git/mergetools/opendiff')
| -rw-r--r-- | third_party/git/mergetools/opendiff | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/third_party/git/mergetools/opendiff b/third_party/git/mergetools/opendiff new file mode 100644 index 0000000000..b608dd6de3 --- /dev/null +++ b/third_party/git/mergetools/opendiff @@ -0,0 +1,14 @@ +diff_cmd () { + "$merge_tool_path" "$LOCAL" "$REMOTE" | cat +} + +merge_cmd () { + if $base_present + then + "$merge_tool_path" "$LOCAL" "$REMOTE" \ + -ancestor "$BASE" -merge "$MERGED" | cat + else + "$merge_tool_path" "$LOCAL" "$REMOTE" \ + -merge "$MERGED" | cat + fi +} |