⚝
One Hat Cyber Team
⚝
Your IP:
216.73.216.14
Server IP:
45.79.8.107
Server:
Linux localhost 5.15.0-140-generic #150-Ubuntu SMP Sat Apr 12 06:00:09 UTC 2025 x86_64
Server Software:
nginx/1.18.0
PHP Version:
8.1.2-1ubuntu2.21
Buat File
|
Buat Folder
Eksekusi
Dir :
~
/
proc
/
452945
/
root
/
usr
/
lib
/
git-core
/
mergetools
/
Edit File: deltawalker
diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1 } merge_cmd () { # Adding $(pwd)/ in front of $MERGED should not be necessary. # However without it, DeltaWalker (at least v1.9.8 on Windows) # crashes with a JRE exception. The DeltaWalker user manual, # shows $(pwd)/ whenever the '-merged' options is given. # Adding it here seems to work around the problem. if $base_present then "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" -merged="$(pwd)/$MERGED" else "$merge_tool_path" "$LOCAL" "$REMOTE" -merged="$(pwd)/$MERGED" fi >/dev/null 2>&1 } translate_merge_tool_path () { echo DeltaWalker } exit_code_trustable () { true }
Simpan