@Ghazascanner
_2019runbot
Ghazascanner File Manager
server :Linux phpmyadmin-ubuntu-m-2vcpu-16gb-blr1-01 5.4.0-216-generic #236-Ubuntu SMP Fri Apr 11 19:53:21 UTC 2025 x86_64
Current Path :
/
lib
/
git-core
/
mergetools
/
Path :
Upload File :
New :
File
Dir
//lib/git-core/mergetools/emerge
diff_cmd () { "$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE" } merge_cmd () { if $base_present then "$merge_tool_path" \ -f emerge-files-with-ancestor-command \ "$LOCAL" "$REMOTE" "$BASE" \ "$(basename "$MERGED")" else "$merge_tool_path" \ -f emerge-files-command \ "$LOCAL" "$REMOTE" \ "$(basename "$MERGED")" fi } translate_merge_tool_path() { echo emacs } exit_code_trustable () { true }