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