File Manager

Current Path : /lib/git-core/mergetools/
Upload File :
Current File : //lib/git-core/mergetools/smerge

diff_cmd () {
	"$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" mergetool "$BASE" "$LOCAL" "$REMOTE" -o "$MERGED"
	else
		"$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
	fi
}

File Manager Version 1.0, Coded By Lucas
Email: hehe@yahoo.com