📁 File Manager Pro
v10.0.2 | PHP: 8.1.34
Server: LiteSpeed
2026-06-27 14:56:00
📂
/
/
usr
/
libexec
/
git-core
/
mergetools
✏️
Editing: ecmerge
diff_cmd () { "$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE" } diff_cmd_help () { echo "Use ECMerge (requires a graphical session)" } merge_cmd () { if $base_present then "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \ --default --mode=merge3 --to="$MERGED" else "$merge_tool_path" "$LOCAL" "$REMOTE" \ --default --mode=merge2 --to="$MERGED" fi } merge_cmd_help () { echo "Use ECMerge (requires a graphical session)" }
💾 Save Changes
❌ Cancel