blob: eb32a7da956dc35ded8e8c129ccb7b23ab13d6a4 [file] [log] [blame]
David Aguilarbc7a96a2011-08-18 00:23:46 -07001diff_cmd () {
2 "$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" >/dev/null 2>&1
3}
4
Fernando Ramos980145f2022-03-30 21:19:09 +02005diff_cmd_help () {
6 echo "Use Araxis Merge (requires a graphical session)"
7}
8
David Aguilarbc7a96a2011-08-18 00:23:46 -07009merge_cmd () {
David Aguilarbc7a96a2011-08-18 00:23:46 -070010 if $base_present
11 then
12 "$merge_tool_path" -wait -merge -3 -a1 \
13 "$BASE" "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
14 else
15 "$merge_tool_path" -wait -2 \
16 "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
17 fi
David Aguilarbc7a96a2011-08-18 00:23:46 -070018}
19
Fernando Ramos980145f2022-03-30 21:19:09 +020020merge_cmd_help () {
21 echo "Use Araxis Merge (requires a graphical session)"
22}
23
David Aguilarbc7a96a2011-08-18 00:23:46 -070024translate_merge_tool_path() {
25 echo compare
26}