One Hat Cyber Team
Your IP :
172.70.80.139
Server IP :
104.21.7.16
Server :
Linux server3.shared.spaceship.host 4.18.0-553.47.1.lve.el8.x86_64 #1 SMP Tue Apr 8 13:54:31 UTC 2025 x86_64
Server Software :
LiteSpeed
PHP Version :
8.2.28
Buat File
|
Buat Folder
Eksekusi
Dir :
~
/
usr
/
libexec
/
git-core
/
mergetools
/
Edit File:
deltawalker
diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1 } diff_cmd_help () { echo "Use DeltaWalker (requires a graphical session)" } 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 } merge_cmd_help () { echo "Use DeltaWalker (requires a graphical session)" } translate_merge_tool_path () { echo DeltaWalker } exit_code_trustable () { true }
Simpan