about summary refs log blame commit diff
path: root/mergetools/opendiff
blob: b608dd6de30aaab9b30729145029761330f9fb55 (plain) (tree)
1
2
3
4
5
6
7
8
9
10
11
12
13
14













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

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