[thirdparty/git.git] / mergetools / ecmerge

diff_cmd () {
	"$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE"
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \
			--default --mode=merge3 --to="$MERGED"
	else
		"$merge_tool_path" "$LOCAL" "$REMOTE" \
			--default --mode=merge2 --to="$MERGED"
	fi
}
Commit	Line	Data
bc7a96a8 DA	1	diff_cmd () {
	2	"$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE"
	3	}
	4
	5	merge_cmd () {
bc7a96a8 DA	6	if $base_present
	7	then
	8	"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \
	9	--default --mode=merge3 --to="$MERGED"
	10	else
	11	"$merge_tool_path" "$LOCAL" "$REMOTE" \
	12	--default --mode=merge2 --to="$MERGED"
	13	fi
bc7a96a8	14	}