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