[thirdparty/git.git] / mergetools / diffmerge

diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
}

diff_cmd_help () {
	echo "Use DiffMerge (requires a graphical session)"
}

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
}

merge_cmd_help () {
	echo "Use DiffMerge (requires a graphical session)"
}

exit_code_trustable () {
	true
}
Commit	Line	Data
c5f424fd SS	1	diff_cmd () {
	2	"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
	3	}
	4
980145f7 FR	5	diff_cmd_help () {
	6	echo "Use DiffMerge (requires a graphical session)"
	7	}
	8
c5f424fd SS	9	merge_cmd () {
	10	if $base_present
	11	then
	12	"$merge_tool_path" --merge --result="$MERGED" \
	13	"$LOCAL" "$BASE" "$REMOTE"
	14	else
	15	"$merge_tool_path" --merge \
	16	--result="$MERGED" "$LOCAL" "$REMOTE"
	17	fi
c5f424fd	18	}
7c10605d	19
980145f7 FR	20	merge_cmd_help () {
	21	echo "Use DiffMerge (requires a graphical session)"
	22	}
	23
7c10605d DA	24	exit_code_trustable () {
	25	true
	26	}