Code

73d70ae28ad1e6a5b38e051442e08c26c074bb22
[git.git] / mergetools / meld
1 diff_cmd () {
2         "$merge_tool_path" "$LOCAL" "$REMOTE"
3 }
5 merge_cmd () {
6         touch "$BACKUP"
7         "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
8         check_unchanged
9 }