Skip to main content

Browse the archive

Revision 6d5b26420848ec3bc7eae46a7ffa54f20276249d authored by Junio C Hamano on 09 July 2019, 22:48:36 UTC, committed by Junio C Hamano on 09 July 2019, 22:48:36 UTC 
The fourth batch
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent cde9a64
Raw File
guiffy 
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}

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

exit_code_trustable () {
	true
}
back to top