🔐 Sid Gifari File Manager Pro
v8.0.5 | 2026-06-14 07:58:43 | PHP 8.1.34
📂
/ (Root)
/
usr
/
libexec
/
git-core
/
mergetools
📍 /usr/libexec/git-core/mergetools
🔄 Refresh
✏️
Editing: tkdiff
Read Only
diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" } diff_cmd_help () { echo "Use TkDiff (requires a graphical session)" } merge_cmd () { if $base_present then "$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE" else "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE" fi } exit_code_trustable () { true } merge_cmd_help () { echo "Use TkDiff (requires a graphical session)" }
💾 Save Changes
❌ Cancel