Dashboard
PHP:
8.1.34
OS:
Linux
User:
uid288609
/
/
usr
/
lib
/
git-core
/
mergetools
📤 Upload
📝 New File
📁 New Folder
Close
Editing: diffuse
diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" | cat } merge_cmd () { if $base_present then "$merge_tool_path" \ "$LOCAL" "$MERGED" "$REMOTE" \ "$BASE" | cat else "$merge_tool_path" \ "$LOCAL" "$MERGED" "$REMOTE" | cat fi }
Save
Cancel