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
kompare 
can_merge () {
	return 1
}

diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}
back to top