Nexus File Manager
v2.0
🏠
Dashboard
⚡
System
🌐
›
usr
›
libexec
›
git-core
›
mergetools
Quick:
⬆️ Parent
🌐 Root
🏠 Home
🌍 WWW
📁 Temp
⚙️ Etc
📤 Upload
📁 Create
⚡ WordPress Admin
🔄 Refresh
✏️ kdiff3
← Back
diff_cmd () { "$merge_tool_path" \ --L1 "$MERGED (A)" --L2 "$MERGED (B)" \ "$LOCAL" "$REMOTE" >/dev/null 2>&1 } diff_cmd_help () { echo "Use KDiff3 (requires a graphical session)" } merge_cmd () { if $base_present then "$merge_tool_path" --auto \ --L1 "$MERGED (Base)" \ --L2 "$MERGED (Local)" \ --L3 "$MERGED (Remote)" \ -o "$MERGED" "$BASE" "$LOCAL" "$REMOTE" \ >/dev/null 2>&1 else "$merge_tool_path" --auto \ --L1 "$MERGED (Local)" \ --L2 "$MERGED (Remote)" \ -o "$MERGED" "$LOCAL" "$REMOTE" \ >/dev/null 2>&1 fi } merge_cmd_help () { echo "Use KDiff3 (requires a graphical session)" } exit_code_trustable () { true } translate_merge_tool_path() { if type kdiff3 >/dev/null 2>/dev/null then echo kdiff3 else mergetool_find_win32_cmd "kdiff3.exe" "Kdiff3" fi }
💻
System Info
Current path
/usr/libexec/git-core/mergetools
Contents
0 folders, 22 files
Disk free
100.55 GB
PHP version
8.3.30
🚀
Quick Actions
📍 Script location
🌐 Web root
🗑️ Temp
📁 /usr/libexec/git-core/mergetools
⚡ Nexus File Manager • 22 items