1diff_cmd () { 2 "$merge_tool_path" "$LOCAL" "$REMOTE" 3} 4 5merge_cmd () { 6 touch "$BACKUP" 7 "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE" 8 check_unchanged 9}
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE"
}
merge_cmd () {
touch "$BACKUP"
"$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
check_unchanged