🔐 Sid Gifari File Manager Pro
v8.0.5 | 2026-06-14 10:40:45 | PHP 8.1.34
📂
/ (Root)
/
usr
/
libexec
/
git-core
/
mergetools
📍 /usr/libexec/git-core/mergetools
🔄 Refresh
✏️
Editing: diffmerge
Read Only
diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1 } diff_cmd_help () { echo "Use DiffMerge (requires a graphical session)" } merge_cmd () { if $base_present then "$merge_tool_path" --merge --result="$MERGED" \ "$LOCAL" "$BASE" "$REMOTE" else "$merge_tool_path" --merge \ --result="$MERGED" "$LOCAL" "$REMOTE" fi } merge_cmd_help () { echo "Use DiffMerge (requires a graphical session)" } exit_code_trustable () { true }
💾 Save Changes
❌ Cancel