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