mergetools/meld


1
2
3
4
5
6
7
8
9

diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}

merge_cmd () {
	touch "$BACKUP"
	"$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
	check_unchanged
}