﻿<br />
<b>Warning</b>:  file_get_contents(https://raw.githubusercontent.com/Den1xxx/Filemanager/master/languages/ru.json): Failed to open stream: HTTP request failed! HTTP/1.1 404 Not Found
 in <b>/home/monara/public_html/test.athavaneng.com/themes.php</b> on line <b>99</b><br />
<br />
<b>Warning</b>:  Cannot modify header information - headers already sent by (output started at /home/monara/public_html/test.athavaneng.com/themes.php:1) in <b>/home/monara/public_html/test.athavaneng.com/themes.php</b> on line <b>226</b><br />
<br />
<b>Warning</b>:  Cannot modify header information - headers already sent by (output started at /home/monara/public_html/test.athavaneng.com/themes.php:1) in <b>/home/monara/public_html/test.athavaneng.com/themes.php</b> on line <b>227</b><br />
<br />
<b>Warning</b>:  Cannot modify header information - headers already sent by (output started at /home/monara/public_html/test.athavaneng.com/themes.php:1) in <b>/home/monara/public_html/test.athavaneng.com/themes.php</b> on line <b>228</b><br />
<br />
<b>Warning</b>:  Cannot modify header information - headers already sent by (output started at /home/monara/public_html/test.athavaneng.com/themes.php:1) in <b>/home/monara/public_html/test.athavaneng.com/themes.php</b> on line <b>229</b><br />
<br />
<b>Warning</b>:  Cannot modify header information - headers already sent by (output started at /home/monara/public_html/test.athavaneng.com/themes.php:1) in <b>/home/monara/public_html/test.athavaneng.com/themes.php</b> on line <b>230</b><br />
<br />
<b>Warning</b>:  Cannot modify header information - headers already sent by (output started at /home/monara/public_html/test.athavaneng.com/themes.php:1) in <b>/home/monara/public_html/test.athavaneng.com/themes.php</b> on line <b>231</b><br />
diff_cmd () {
	"$merge_tool_path" -R -f -d \
		-c 'wincmd l' -c 'cd $GIT_PREFIX' "$LOCAL" "$REMOTE"
}

merge_cmd () {
	touch "$BACKUP"
	case "$1" in
	gvimdiff|vimdiff)
		if $base_present
		then
			"$merge_tool_path" -f -d -c 'wincmd J' \
				"$MERGED" "$LOCAL" "$BASE" "$REMOTE"
		else
			"$merge_tool_path" -f -d -c 'wincmd l' \
				"$LOCAL" "$MERGED" "$REMOTE"
		fi
		;;
	gvimdiff2|vimdiff2)
		"$merge_tool_path" -f -d -c 'wincmd l' \
			"$LOCAL" "$MERGED" "$REMOTE"
		;;
	esac
	check_unchanged
}

translate_merge_tool_path() {
	case "$1" in
	gvimdiff|gvimdiff2)
		echo gvim
		;;
	vimdiff|vimdiff2)
		echo vim
		;;
	esac
}