| diff_cmd () { | |
| "$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE" | |
| } | |
| merge_cmd () { | |
| touch "$BACKUP" | |
| if $base_present | |
| then | |
| "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \ | |
| --default --mode=merge3 --to="$MERGED" | |
| else | |
| "$merge_tool_path" "$LOCAL" "$REMOTE" \ | |
| --default --mode=merge2 --to="$MERGED" | |
| fi | |
| check_unchanged | |
| } |