Tryag File Manager
Home
||
Turbo Force
||
B-F Config_Cpanel
Current none :
/
proc
/
thread-self
/
root
/
usr
/
lib
/
git-core
/
mergetools
/
Or
Select Your none :
Upload File :
New :
File
Dir
//proc/thread-self/root/usr/lib/git-core/mergetools/opendiff
diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" | cat } merge_cmd () { if $base_present then "$merge_tool_path" "$LOCAL" "$REMOTE" \ -ancestor "$BASE" -merge "$MERGED" | cat else "$merge_tool_path" "$LOCAL" "$REMOTE" \ -merge "$MERGED" | cat fi }