daff-package	daff
daff	daff
differs_from	differs_from
diff_data	diff_data
merge_data	merge_data
patch_data	patch_data
read_diff	readwrite
render_diff	render_diff
which_conflicts	which_conflicts
write_diff	readwrite
