Файловый менеджер - Редактировать - /usr/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 }
| ver. 1.4 |
Github
|
.
| PHP 7.4.3-4ubuntu2.29 | Генерация страницы: 0.01 |
proxy
|
phpinfo
|
Настройка