ediff.git-mergetool


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

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

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" -c \
			-3 "$LOCAL" "$REMOTE" "$BASE" \
			-m "$MERGED"
	else
		"$merge_tool_path" -c \
			"$LOCAL" "$REMOTE" \
			-m "$MERGED"
	fi
}

exit_code_trustable () {
	true
}