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
araxis 
diff_cmd () {
	"$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" >/dev/null 2>&1
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" -wait -merge -3 -a1 \
			"$BASE" "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
	else
		"$merge_tool_path" -wait -2 \
			"$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
	fi
}

translate_merge_tool_path() {
	echo compare
}
back to top