diff options
Diffstat (limited to 'mergetools/opendiff')
| -rw-r--r-- | mergetools/opendiff | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/mergetools/opendiff b/mergetools/opendiff new file mode 100644 index 0000000..44adf8f --- /dev/null +++ b/mergetools/opendiff @@ -0,0 +1,22 @@ +diff_cmd () { + "$merge_tool_path" "$LOCAL" "$REMOTE" | cat +} + +diff_cmd_help () { + echo "Use FileMerge (requires a graphical session)" +} + +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 +} + +merge_cmd_help () { + echo "Use FileMerge (requires a graphical session)" +} |