Skip to main content

Browse the archive

Revision 8f9aeb0d36c6cbfb849946bb272fa0d3c4611547 authored by Junio C Hamano on 24 March 2017, 19:59:15 UTC, committed by Junio C Hamano on 24 March 2017, 19:59:15 UTC 
Git 2.12.2
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 75d4476
Raw File
tkdiff 
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"
	else
		"$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
	fi
}

exit_code_trustable () {
	true
}
back to top