One Hat Cyber Team
Your IP :
172.69.17.93
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:
araxis
diff_cmd () { "$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" >/dev/null 2>&1 } diff_cmd_help () { echo "Use Araxis Merge (requires a graphical session)" } merge_cmd () { if $base_present then "$merge_tool_path" -wait -merge -3 -a1 \ "$BASE" "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1 else "$merge_tool_path" -wait -2 \ "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1 fi } merge_cmd_help () { echo "Use Araxis Merge (requires a graphical session)" } translate_merge_tool_path() { echo compare }
Simpan