diff options
Diffstat (limited to 'third_party/git/mergetools/araxis')
| -rw-r--r-- | third_party/git/mergetools/araxis | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/third_party/git/mergetools/araxis b/third_party/git/mergetools/araxis new file mode 100644 index 0000000000..e2407b65b7 --- /dev/null +++ b/third_party/git/mergetools/araxis @@ -0,0 +1,18 @@ +diff_cmd () { + "$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" >/dev/null 2>&1 +} + +merge_cmd () { + if $base_present + then + "$merge_tool_path" -wait -merge -3 -a1 \ + "$BASE" "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1 + else + "$merge_tool_path" -wait -2 \ + "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1 + fi +} + +translate_merge_tool_path() { + echo compare +} |