git
26 строк · 515.0 Байт
1diff_cmd () {
2"$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" >/dev/null 2>&1
3}
4
5diff_cmd_help () {
6echo "Use Araxis Merge (requires a graphical session)"
7}
8
9merge_cmd () {
10if $base_present
11then
12"$merge_tool_path" -wait -merge -3 -a1 \
13"$BASE" "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
14else
15"$merge_tool_path" -wait -2 \
16"$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
17fi
18}
19
20merge_cmd_help () {
21echo "Use Araxis Merge (requires a graphical session)"
22}
23
24translate_merge_tool_path() {
25echo compare
26}
27