The third batch
[git.git] / mergetools / araxis
blobe2407b65b70d1e622979cdb2fe0e425ba6403ee1
1 diff_cmd () {
2         "$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" >/dev/null 2>&1
5 merge_cmd () {
6         if $base_present
7         then
8                 "$merge_tool_path" -wait -merge -3 -a1 \
9                         "$BASE" "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
10         else
11                 "$merge_tool_path" -wait -2 \
12                         "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
13         fi
16 translate_merge_tool_path() {
17         echo compare