mergetools/diffuse


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17

diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
}
 
merge_cmd () {
	touch "$BACKUP"
	if $base_present
	then
		"$merge_tool_path" \
			"$LOCAL" "$MERGED" "$REMOTE" \
			"$BASE" | cat
	else
		"$merge_tool_path" \
			"$LOCAL" "$MERGED" "$REMOTE" | cat
	fi
	check_unchanged
}