Mini Shell Moded By TiGER HeX
Home
||
Turbo Force
||
B-F Config_Cpanel
Current Path :
/
proc
/
self
/
root
/
lib
/
git-core
/
mergetools
/
Linux midnightridazz 4.19.0-11-cloud-amd64 #1 SMP Debian 4.19.146-1 (2020-09-17) x86_64
Upload File :
New :
File
Dir
//proc/self/root/lib/git-core/mergetools/diffmerge
diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1 } merge_cmd () { if $base_present then "$merge_tool_path" --merge --result="$MERGED" \ "$LOCAL" "$BASE" "$REMOTE" else "$merge_tool_path" --merge \ --result="$MERGED" "$LOCAL" "$REMOTE" fi } exit_code_trustable () { true }