Tryag File Manager
Home
||
Turbo Force
||
B-F Config_Cpanel
Current none :
/
proc
/
thread-self
/
root
/
proc
/
thread-self
/
root
/
lib
/
git-core
/
mergetools
/
Or
Select Your none :
Upload File :
New :
File
Dir
//proc/thread-self/root/proc/thread-self/root/lib/git-core/mergetools/bc
diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" } merge_cmd () { if $base_present then "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \ -mergeoutput="$MERGED" else "$merge_tool_path" "$LOCAL" "$REMOTE" \ -mergeoutput="$MERGED" fi } translate_merge_tool_path() { if type bcomp >/dev/null 2>/dev/null then echo bcomp else echo bcompare fi }