[thirdparty/git.git] / mergetools / guiffy

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

diff_cmd_help () {
	echo "Use Guiffy's Diff Tool (requires a graphical session)"
}

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

merge_cmd_help () {
	echo "Use Guiffy's Diff Tool (requires a graphical session)"
}

exit_code_trustable () {
	true
}
Commit	Line	Data
6ceb658c BR	1	diff_cmd () {
	2	"$merge_tool_path" "$LOCAL" "$REMOTE"
	3	}
	4
980145f7 FR	5	diff_cmd_help () {
	6	echo "Use Guiffy's Diff Tool (requires a graphical session)"
	7	}
	8
6ceb658c BR	9	merge_cmd () {
	10	if $base_present
	11	then
	12	"$merge_tool_path" -s "$LOCAL" \
	13	"$REMOTE" "$BASE" "$MERGED"
	14	else
	15	"$merge_tool_path" -m "$LOCAL" \
	16	"$REMOTE" "$MERGED"
	17	fi
	18	}
	19
980145f7 FR	20	merge_cmd_help () {
	21	echo "Use Guiffy's Diff Tool (requires a graphical session)"
	22	}
	23
6ceb658c BR	24	exit_code_trustable () {
	25	true
	26	}