summaryrefslogtreecommitdiff
path: root/mergetools/guiffy
blob: 8b23a13c4111bdecc700a4a1a4547e15760eba58 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}

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

exit_code_trustable () {
	true
}