| Server IP : 112.175.184.31 / Your IP : 216.73.217.60 Web Server : Apache System : Linux dot-k1-031.dothome.co.kr 4.18.0-553.156.1.el8_10.x86_64 #1 SMP Mon Aug 17 17:52:57 UTC 2026 x86_64 User : lovelove8926 ( 1226) PHP Version : 7.4.33 Disable Function : proc_open, passthru, show_source, socket_create, socket_accept MySQL : OFF | cURL : ON | WGET : ON | Perl : ON | Python : OFF | Sudo : ON | Pkexec : ON Directory : /ssh-jail/karos1/usr/libexec/git-core/mergetools/ |
Upload File : |
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)"
}