summaryrefslogtreecommitdiff
path: root/mergetools/diffmerge
blob: 85ac7201571ed34c35a3613b97bd1b82982e0d61 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
}
 
merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" --merge --result="$MERGED" \
			"$LOCAL" "$BASE" "$REMOTE"
	else
		"$merge_tool_path" --merge \
			--result="$MERGED" "$LOCAL" "$REMOTE"
	fi
	status=$?
}