/
/
usr
/
libexec
/
git-core
/
mergetools
Server: server63.web-hosting.com (198.54.116.184)
You: 216.73.216.220
PHP 7.4.33
Dir:
/usr/libexec/git-core/mergetools
Edit:
/usr/libexec/git-core/mergetools/diffuse
diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" | cat } diff_cmd_help () { echo "Use Diffuse (requires a graphical session)" } merge_cmd () { if $base_present then "$merge_tool_path" \ "$LOCAL" "$MERGED" "$REMOTE" \ "$BASE" | cat else "$merge_tool_path" \ "$LOCAL" "$MERGED" "$REMOTE" | cat fi } merge_cmd_help () { echo "Use Diffuse (requires a graphical session)" }
Ukuran: 395 B