Warning: file_get_contents(https://raw.githubusercontent.com/Den1xxx/Filemanager/master/languages/ru.json): failed to open stream: HTTP request failed! HTTP/1.1 404 Not Found in /home/familylifersmpc/htdocs/www.familylifersmpc.com/index.php on line 91
diff_cmd () { "$merge_tool_path" \ -R 'Accel.Search: "Ctrl+F"' \ -R 'Accel.SearchForward: "Ctrl+G"' \ "$LOCAL" "$REMOTE" # xxdiff can segfault on binary files which are often uninteresting. # Do not allow segfaults to stop us from continuing on to the next file. if test $? = 128 then return 1 fi } merge_cmd () { if $base_present then "$merge_tool_path" -X --show-merged-pane \ -R 'Accel.SaveAsMerged: