Blame - mergetools/kompare - jrn/git - Git at Google

blob: e8c0bfa678547258ff0f330ae756f3621e6aadc7 [file] [log] [blame]

David Aguilar	bc7a96a	2011-08-18 00:23:46 -0700	[diff] [blame]	1	can_merge () {
				2	return 1
				3	}
				4
				5	diff_cmd () {
				6	"$merge_tool_path" "$LOCAL" "$REMOTE"
				7	}
David Aguilar	7c10605	2016-11-29 01:38:07 -0800	[diff] [blame]	8
				9	exit_code_trustable () {
				10	true
				11	}