Skip to main content

Browse the archive

Revision d95553a6b8c5153f541adcfc3346004e8249b0e6 authored by Junio C Hamano on 03 April 2016, 17:11:35 UTC, committed by Junio C Hamano on 03 April 2016, 17:14:12 UTC 
Git 2.8.1
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 6e4de7f
Raw File
diffuse 
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
}

merge_cmd () {
	touch "$BACKUP"
	if $base_present
	then
		"$merge_tool_path" \
			"$LOCAL" "$MERGED" "$REMOTE" \
			"$BASE" | cat
	else
		"$merge_tool_path" \
			"$LOCAL" "$MERGED" "$REMOTE" | cat
	fi
	check_unchanged
}
back to top