about summary refs log tree commit diff
path: root/mergetools/diffuse
blob: 5a3ae8b5695d3141ff0310a706495ea52037b464 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
}

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