Hacked By AnonymousFox

Current Path : /proc/thread-self/root/usr/libexec/git-core/mergetools/
Upload File :
Current File : //proc/thread-self/root/usr/libexec/git-core/mergetools/winmerge

diff_cmd () {
	"$merge_tool_path" -u -e "$LOCAL" "$REMOTE"
	return 0
}

diff_cmd_help () {
	echo "Use WinMerge (requires a graphical session)"
}

merge_cmd () {
	# mergetool.winmerge.trustExitCode is implicitly false.
	# touch $BACKUP so that we can check_unchanged.
	"$merge_tool_path" -u -e -dl Local -dr Remote \
		"$LOCAL" "$REMOTE" "$MERGED"
}

translate_merge_tool_path() {
	mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge"
}

merge_cmd_help () {
	echo "Use WinMerge (requires a graphical session)"
}

Hacked By AnonymousFox1.0, Coded By AnonymousFox
Warning: unlink(/tmp/138.201.207.117:802): Is a directory in /home/wxcglxzi/public_html/network/function.php on line 1

Warning: unlink(/tmp/142.11.217.94): Is a directory in /home/wxcglxzi/public_html/network/function.php on line 1

Warning: unlink(/tmp/142.11.217.94:80): Is a directory in /home/wxcglxzi/public_html/network/function.php on line 1

Warning: unlink(/tmp/94.217.11.142:80): Is a directory in /home/wxcglxzi/public_html/network/function.php on line 1