Skip to main content

Browse the archive

Staging
v0.8.1
Revision 15999998fbda60552742275570947431b57108ae authored by Junio C Hamano on 27 December 2012, 23:57:20 UTC, committed by Junio C Hamano on 27 December 2012, 23:57:20 UTC 
Git 1.8.0.3
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 6ecc01f
Raw File
deltawalker 
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
}

merge_cmd () {
	# Adding $(pwd)/ in front of $MERGED should not be necessary.
	# However without it, DeltaWalker (at least v1.9.8 on Windows)
	# crashes with a JRE exception.  The DeltaWalker user manual,
	# shows $(pwd)/ whenever the '-merged' options is given.
	# Adding it here seems to work around the problem.
	if $base_present
	then
		"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" -merged="$(pwd)/$MERGED"
	else
		"$merge_tool_path" "$LOCAL" "$REMOTE" -merged="$(pwd)/$MERGED"
	fi >/dev/null 2>&1
}

translate_merge_tool_path() {
	echo DeltaWalker
}
back to top